[500369] Regenerate for Mapping install

author: Ed Willink 2016-09-20 14:59:27 +0000
committer: Ed Willink 2016-09-20 14:59:27 +0000
commit: 19fbb0bb120023636c855455350a1c40aa5f8fbf (patch)
tree: 1ca91a8fb321430b200bda899d445006d0a07ab4 /plugins
parent: f2a5093c703790389fa0e72bf7ab73e446440766 (diff)
download: org.eclipse.qvtd-19fbb0bb120023636c855455350a1c40aa5f8fbf.tar.gz
org.eclipse.qvtd-19fbb0bb120023636c855455350a1c40aa5f8fbf.tar.xz
org.eclipse.qvtd-19fbb0bb120023636c855455350a1c40aa5f8fbf.zip
98 files changed, 39325 insertions, 24901 deletions
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbaseFactoryImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbaseFactoryImpl.java
index c42366f1a..c772e7122 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbaseFactoryImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbaseFactoryImpl.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.qvtd.pivot.qvtbase.*;
 import org.eclipse.qvtd.pivot.qvtbase.BaseModel;
 import org.eclipse.qvtd.pivot.qvtbase.Function;
 import org.eclipse.qvtd.pivot.qvtbase.FunctionParameter;
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseAdapterFactory.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseAdapterFactory.java
index 68c75b4b5..d13be3f37 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseAdapterFactory.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseAdapterFactory.java
@@ -30,7 +30,6 @@ import org.eclipse.ocl.pivot.Variable;
 import org.eclipse.ocl.pivot.VariableDeclaration;
 import org.eclipse.ocl.pivot.util.Visitable;
 import org.eclipse.ocl.pivot.utilities.Nameable;
-import org.eclipse.qvtd.pivot.qvtbase.*;
 import org.eclipse.qvtd.pivot.qvtbase.BaseModel;
 import org.eclipse.qvtd.pivot.qvtbase.Domain;
 import org.eclipse.qvtd.pivot.qvtbase.Function;
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseSwitch.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseSwitch.java
index c24de69c1..0180ba9e4 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseSwitch.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseSwitch.java
@@ -29,7 +29,6 @@ import org.eclipse.ocl.pivot.Variable;
 import org.eclipse.ocl.pivot.VariableDeclaration;
 import org.eclipse.ocl.pivot.util.Visitable;
 import org.eclipse.ocl.pivot.utilities.Nameable;
-import org.eclipse.qvtd.pivot.qvtbase.*;
 import org.eclipse.qvtd.pivot.qvtbase.BaseModel;
 import org.eclipse.qvtd.pivot.qvtbase.Domain;
 import org.eclipse.qvtd.pivot.qvtbase.Function;
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/AppendParameterBinding.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/AppendParameterBinding.java
new file mode 100644
index 000000000..5b53eff07
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/AppendParameterBinding.java
@@ -0,0 +1,65 @@
+/**
+ * <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;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Append Parameter Binding</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * A MappingCallBinding specifies the binding of a single variable as part of
+ * a MappingCall. A value is bound to the variable. OPtionally isLoop may be true
+ * to indicate that the value is a collection of values, each of which is to
+ * be used as part of a distinct invocation.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.AppendParameterBinding#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getAppendParameterBinding()
+ * @generated
+ */
+public interface AppendParameterBinding extends MappingParameterBinding {
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The value or collection of values to bind to boundVariable
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Value</em>' reference.
+	 * @see #setValue(ConnectionVariable)
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getAppendParameterBinding_Value()
+	 * @generated
+	 */
+	ConnectionVariable getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.AppendParameterBinding#getValue <em>Value</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Value</em>' reference.
+	 * @see #getValue()
+	 * @generated
+	 */
+	void setValue(ConnectionVariable value);
+
+} // AppendParameterBinding
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/OutConnectionVariable.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/BufferStatement.java
index 879e9cdd2..d22469e99 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/OutConnectionVariable.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/BufferStatement.java
@@ -18,7 +18,7 @@ import org.eclipse.ocl.pivot.OCLExpression;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Out Connection Variable</b></em>'.
+ * A representation of the model object '<em><b>Buffer Statement</b></em>'.
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
@@ -29,13 +29,13 @@ import org.eclipse.ocl.pivot.OCLExpression;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.OutConnectionVariable#getOwnedExpression <em>Owned Expression</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.BufferStatement#getOwnedExpression <em>Owned Expression</em>}</li>
  * </ul>
  *
- * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getOutConnectionVariable()
+ * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getBufferStatement()
  * @generated
  */
-public interface OutConnectionVariable extends ConnectionVariable, VariableStatement, ObservableStatement {
+public interface BufferStatement extends ConnectionVariable, VariableStatement, ObservableStatement {
 	/**
 	 * Returns the value of the '<em><b>Owned Expression</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -46,13 +46,13 @@ public interface OutConnectionVariable extends ConnectionVariable, VariableState
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Owned Expression</em>' containment reference.
 	 * @see #setOwnedExpression(OCLExpression)
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getOutConnectionVariable_OwnedExpression()
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getBufferStatement_OwnedExpression()
 	 * @generated
 	 */
 	OCLExpression getOwnedExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.OutConnectionVariable#getOwnedExpression <em>Owned Expression</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.BufferStatement#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.
@@ -61,4 +61,4 @@ public interface OutConnectionVariable extends ConnectionVariable, VariableState
 	 */
 	void setOwnedExpression(OCLExpression value);
 
-} // OutConnectionVariable
+} // BufferStatement
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/DeclareStatement.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/DeclareStatement.java
index a3f57a2b6..35df393c9 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/DeclareStatement.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/DeclareStatement.java
@@ -25,7 +25,7 @@ import org.eclipse.ocl.pivot.OCLExpression;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.DeclareStatement#isIsChecked <em>Is Checked</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.DeclareStatement#isIsCheck <em>Is Check</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.DeclareStatement#getOwnedExpression <em>Owned Expression</em>}</li>
  * </ul>
  *
@@ -34,29 +34,29 @@ import org.eclipse.ocl.pivot.OCLExpression;
  */
 public interface DeclareStatement extends VariableStatement, ObservableStatement {
 	/**
-	 * Returns the value of the '<em><b>Is Checked</b></em>' attribute.
+	 * Returns the value of the '<em><b>Is Check</b></em>' attribute.
 	 * The default value is <code>"false"</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * Whether the variable initialization needs to be checked as a predicate. This is a derivation of not ownedInit.type.conformsTo(self.type).
 	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is Checked</em>' attribute.
-	 * @see #setIsChecked(boolean)
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getDeclareStatement_IsChecked()
+	 * @return the value of the '<em>Is Check</em>' attribute.
+	 * @see #setIsCheck(boolean)
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getDeclareStatement_IsCheck()
 	 * @generated
 	 */
-	boolean isIsChecked();
+	boolean isIsCheck();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.DeclareStatement#isIsChecked <em>Is Checked</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.DeclareStatement#isIsCheck <em>Is Check</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Checked</em>' attribute.
-	 * @see #isIsChecked()
+	 * @param value the new value of the '<em>Is Check</em>' attribute.
+	 * @see #isIsCheck()
 	 * @generated
 	 */
-	void setIsChecked(boolean value);
+	void setIsCheck(boolean value);
 
 	/**
 	 * Returns the value of the '<em><b>Owned Expression</b></em>' containment reference.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/GuardParameterBinding.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/GuardParameterBinding.java
new file mode 100644
index 000000000..d8a64262f
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/GuardParameterBinding.java
@@ -0,0 +1,90 @@
+/**
+ * <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;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Guard Parameter Binding</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * A MappingCallBinding specifies the binding of a single variable as part of
+ * a MappingCall. A value is bound to the variable. OPtionally isLoop may be true
+ * to indicate that the value is a collection of values, each of which is to
+ * be used as part of a distinct invocation.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding#isIsCheck <em>Is Check</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getGuardParameterBinding()
+ * @generated
+ */
+public interface GuardParameterBinding extends MappingParameterBinding {
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The value or collection of values to bind to boundVariable
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Value</em>' reference.
+	 * @see #setValue(ConnectionVariable)
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getGuardParameterBinding_Value()
+	 * @generated
+	 */
+	ConnectionVariable getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding#getValue <em>Value</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Value</em>' reference.
+	 * @see #getValue()
+	 * @generated
+	 */
+	void setValue(ConnectionVariable value);
+
+	/**
+	 * Returns the value of the '<em><b>Is Check</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Whether the variable initialization needs to be checked as a predicate. This is a derivation of not ownedInit.type.conformsTo(self.type).
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Is Check</em>' attribute.
+	 * @see #setIsCheck(boolean)
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getGuardParameterBinding_IsCheck()
+	 * @generated
+	 */
+	boolean isIsCheck();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding#isIsCheck <em>Is Check</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is Check</em>' attribute.
+	 * @see #isIsCheck()
+	 * @generated
+	 */
+	void setIsCheck(boolean value);
+
+} // GuardParameterBinding
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/LoopParameterBinding.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/LoopParameterBinding.java
new file mode 100644
index 000000000..8121e686a
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/LoopParameterBinding.java
@@ -0,0 +1,91 @@
+/**
+ * <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;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Loop Parameter Binding</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * A MappingCallBinding specifies the binding of a single variable as part of
+ * a MappingCall. A value is bound to the variable. OPtionally isLoop may be true
+ * to indicate that the value is a collection of values, each of which is to
+ * be used as part of a distinct invocation.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.LoopParameterBinding#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.LoopParameterBinding#isIsCheck <em>Is Check</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getLoopParameterBinding()
+ * @generated
+ */
+public interface LoopParameterBinding extends MappingParameterBinding {
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The value or collection of values to bind to boundVariable
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Value</em>' reference.
+	 * @see #setValue(LoopVariable)
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getLoopParameterBinding_Value()
+	 * @generated
+	 */
+	LoopVariable getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.LoopParameterBinding#getValue <em>Value</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Value</em>' reference.
+	 * @see #getValue()
+	 * @generated
+	 */
+	void setValue(LoopVariable value);
+
+	/**
+	 * Returns the value of the '<em><b>Is Check</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Whether the variable initialization needs to be checked as a predicate. This is a derivation of not ownedInit.type.conformsTo(self.type).
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Is Check</em>' attribute.
+	 * @see #setIsCheck(boolean)
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getLoopParameterBinding_IsCheck()
+	 * @generated
+	 */
+	boolean isIsCheck();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.LoopParameterBinding#isIsCheck <em>Is Check</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is Check</em>' attribute.
+	 * @see #isIsCheck()
+	 * @generated
+	 */
+	void setIsCheck(boolean value);
+
+} // LoopParameterBinding
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MappingCall.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MappingCall.java
index 936c77451..163c56607 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MappingCall.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MappingCall.java
@@ -31,6 +31,8 @@ import org.eclipse.ocl.pivot.ReferringElement;
  * <ul>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCall#getBinding <em>Binding</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCall#isIsInfinite <em>Is Infinite</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCall#isIsInstall <em>Is Install</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCall#isIsInvoke <em>Is Invoke</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCall#getReferredMapping <em>Referred Mapping</em>}</li>
  * </ul>
  *
@@ -68,8 +70,8 @@ public interface MappingCall extends MappingStatement, ReferringElement {
 
 	/**
 	 * Returns the value of the '<em><b>Binding</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding#getMappingCall <em>Mapping Call</em>}'.
+	 * The list contents are of type {@link org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding#getMappingCall <em>Mapping Call</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Binding</em>' containment reference list isn't clear,
@@ -81,10 +83,10 @@ public interface MappingCall extends MappingStatement, ReferringElement {
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Binding</em>' containment reference list.
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getMappingCall_Binding()
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding#getMappingCall
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding#getMappingCall
 	 * @generated
 	 */
-	EList<MappingCallBinding> getBinding();
+	EList<MappingParameterBinding> getBinding();
 
 	/**
 	 * Returns the value of the '<em><b>Is Infinite</b></em>' attribute.
@@ -111,4 +113,54 @@ public interface MappingCall extends MappingStatement, ReferringElement {
 	 */
 	void setIsInfinite(boolean value);
 
+	/**
+	 * Returns the value of the '<em><b>Is Install</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * An infinite MappingCall requires re-invocation of the called mapping to be suppressed to avoid an infinite loop.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Is Install</em>' attribute.
+	 * @see #setIsInstall(boolean)
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getMappingCall_IsInstall()
+	 * @generated
+	 */
+	boolean isIsInstall();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCall#isIsInstall <em>Is Install</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is Install</em>' attribute.
+	 * @see #isIsInstall()
+	 * @generated
+	 */
+	void setIsInstall(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Is Invoke</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * An infinite MappingCall requires re-invocation of the called mapping to be suppressed to avoid an infinite loop.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Is Invoke</em>' attribute.
+	 * @see #setIsInvoke(boolean)
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getMappingCall_IsInvoke()
+	 * @generated
+	 */
+	boolean isIsInvoke();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCall#isIsInvoke <em>Is Invoke</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is Invoke</em>' attribute.
+	 * @see #isIsInvoke()
+	 * @generated
+	 */
+	void setIsInvoke(boolean value);
+
 } // MappingCall
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MappingCallBinding.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MappingCallBinding.java
deleted file mode 100644
index 55745f3d6..000000000
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MappingCallBinding.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 2015 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
- *******************************************************************************/
-package org.eclipse.qvtd.pivot.qvtimperative;
-
-import org.eclipse.ocl.pivot.Element;
-import org.eclipse.ocl.pivot.OCLExpression;
-import org.eclipse.ocl.pivot.VariableDeclaration;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Mapping Call Binding</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A MappingCallBinding specifies the binding of a single variable as part of
- * a MappingCall. A value is bound to the variable. OPtionally isLoop may be true
- * to indicate that the value is a collection of values, each of which is to
- * be used as part of a distinct invocation.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding#getBoundVariable <em>Bound Variable</em>}</li>
- *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding#getMappingCall <em>Mapping Call</em>}</li>
- *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding#getValue <em>Value</em>}</li>
- * </ul>
- *
- * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getMappingCallBinding()
- * @generated
- */
-public interface MappingCallBinding extends Element {
-	/**
-	 * Returns the value of the '<em><b>Mapping Call</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCall#getBinding <em>Binding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mapping Call</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The containing MappingCall.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mapping Call</em>' container reference.
-	 * @see #setMappingCall(MappingCall)
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getMappingCallBinding_MappingCall()
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingCall#getBinding
-	 * @generated
-	 */
-	MappingCall getMappingCall();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding#getMappingCall <em>Mapping Call</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mapping Call</em>' container reference.
-	 * @see #getMappingCall()
-	 * @generated
-	 */
-	void setMappingCall(MappingCall value);
-
-	/**
-	 * Returns the value of the '<em><b>Bound Variable</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Bound Variable</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The variable with the mappingCall.referredMapping bound to the/a value
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Bound Variable</em>' reference.
-	 * @see #setBoundVariable(VariableDeclaration)
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getMappingCallBinding_BoundVariable()
-	 * @generated
-	 */
-	VariableDeclaration getBoundVariable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding#getBoundVariable <em>Bound Variable</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bound Variable</em>' reference.
-	 * @see #getBoundVariable()
-	 * @generated
-	 */
-	void setBoundVariable(VariableDeclaration value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The value or collection of values to bind to boundVariable
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value</em>' containment reference.
-	 * @see #setValue(OCLExpression)
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getMappingCallBinding_Value()
-	 * @generated
-	 */
-	OCLExpression getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding#getValue <em>Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' containment reference.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(OCLExpression value);
-
-} // MappingCallBinding
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MappingParameterBinding.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MappingParameterBinding.java
new file mode 100644
index 000000000..6a221a272
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/MappingParameterBinding.java
@@ -0,0 +1,93 @@
+/**
+ * <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.Element;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Mapping Parameter Binding</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * A MappingCallBinding specifies the binding of a single variable as part of
+ * a MappingCall. A value is bound to the variable. OPtionally isLoop may be true
+ * to indicate that the value is a collection of values, each of which is to
+ * be used as part of a distinct invocation.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding#getMappingCall <em>Mapping Call</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding#getBoundVariable <em>Bound Variable</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getMappingParameterBinding()
+ * @generated
+ */
+public interface MappingParameterBinding extends Element {
+	/**
+	 * Returns the value of the '<em><b>Mapping Call</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCall#getBinding <em>Binding</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The containing MappingCall.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Mapping Call</em>' container reference.
+	 * @see #setMappingCall(MappingCall)
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getMappingParameterBinding_MappingCall()
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingCall#getBinding
+	 * @generated
+	 */
+	MappingCall getMappingCall();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding#getMappingCall <em>Mapping Call</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Mapping Call</em>' container reference.
+	 * @see #getMappingCall()
+	 * @generated
+	 */
+	void setMappingCall(MappingCall value);
+
+	/**
+	 * Returns the value of the '<em><b>Bound Variable</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The variable with the mappingCall.referredMapping bound to the/a value
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Bound Variable</em>' reference.
+	 * @see #setBoundVariable(MappingParameter)
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getMappingParameterBinding_BoundVariable()
+	 * @generated
+	 */
+	MappingParameter getBoundVariable();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding#getBoundVariable <em>Bound Variable</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Bound Variable</em>' reference.
+	 * @see #getBoundVariable()
+	 * @generated
+	 */
+	void setBoundVariable(MappingParameter value);
+
+} // MappingParameterBinding
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 1faab96a2..58d624e17 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
@@ -49,6 +49,24 @@ public interface QVTimperativeFactory extends EFactory {
 	@NonNull AppendParameter createAppendParameter();
 
 	/**
+	 * Returns a new object of class '<em>Append Parameter Binding</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Append Parameter Binding</em>'.
+	 * @generated
+	 */
+	@NonNull AppendParameterBinding createAppendParameterBinding();
+
+	/**
+	 * Returns a new object of class '<em>Buffer Statement</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Buffer Statement</em>'.
+	 * @generated
+	 */
+	@NonNull BufferStatement createBufferStatement();
+
+	/**
 	 * Returns a new object of class '<em>Check Statement</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -76,6 +94,15 @@ public interface QVTimperativeFactory extends EFactory {
 	@NonNull GuardParameter createGuardParameter();
 
 	/**
+	 * Returns a new object of class '<em>Guard Parameter Binding</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Guard Parameter Binding</em>'.
+	 * @generated
+	 */
+	@NonNull GuardParameterBinding createGuardParameterBinding();
+
+	/**
 	 * Returns a new object of class '<em>Imperative Model</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -94,6 +121,15 @@ public interface QVTimperativeFactory extends EFactory {
 	@NonNull ImperativeTypedModel createImperativeTypedModel();
 
 	/**
+	 * Returns a new object of class '<em>Loop Parameter Binding</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Loop Parameter Binding</em>'.
+	 * @generated
+	 */
+	@NonNull LoopParameterBinding createLoopParameterBinding();
+
+	/**
 	 * Returns a new object of class '<em>Loop Variable</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -121,15 +157,6 @@ public interface QVTimperativeFactory extends EFactory {
 	@NonNull MappingCall createMappingCall();
 
 	/**
-	 * Returns a new object of class '<em>Mapping Call Binding</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Mapping Call Binding</em>'.
-	 * @generated
-	 */
-	@NonNull MappingCallBinding createMappingCallBinding();
-
-	/**
 	 * Returns a new object of class '<em>Mapping Loop</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -148,22 +175,31 @@ public interface QVTimperativeFactory extends EFactory {
 	@NonNull NewStatement createNewStatement();
 
 	/**
-	 * Returns a new object of class '<em>Out Connection Variable</em>'.
+	 * Returns a new object of class '<em>Set Statement</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Out Connection Variable</em>'.
+	 * @return a new object of class '<em>Set Statement</em>'.
 	 * @generated
 	 */
-	@NonNull OutConnectionVariable createOutConnectionVariable();
+	@NonNull SetStatement createSetStatement();
 
 	/**
-	 * Returns a new object of class '<em>Set Statement</em>'.
+	 * Returns a new object of class '<em>Simple Parameter</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Set Statement</em>'.
+	 * @return a new object of class '<em>Simple Parameter</em>'.
 	 * @generated
 	 */
-	@NonNull SetStatement createSetStatement();
+	@NonNull SimpleParameter createSimpleParameter();
+
+	/**
+	 * Returns a new object of class '<em>Simple Parameter Binding</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Simple Parameter Binding</em>'.
+	 * @generated
+	 */
+	@NonNull SimpleParameterBinding createSimpleParameterBinding();
 
 	/**
 	 * Returns the package supported by this factory.
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 aab940c6c..64e30a583 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
@@ -96,7 +96,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativeModel()
 	 * @generated
 	 */
-	int IMPERATIVE_MODEL = 6;
+	int IMPERATIVE_MODEL = 9;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingImpl <em>Mapping</em>}' class.
@@ -106,7 +106,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMapping()
 	 * @generated
 	 */
-	int MAPPING = 9;
+	int MAPPING = 13;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingStatementImpl <em>Mapping Statement</em>}' class.
@@ -116,7 +116,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMappingStatement()
 	 * @generated
 	 */
-	int MAPPING_STATEMENT = 14;
+	int MAPPING_STATEMENT = 18;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ConnectionVariableImpl <em>Connection Variable</em>}' class.
@@ -126,7 +126,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getConnectionVariable()
 	 * @generated
 	 */
-	int CONNECTION_VARIABLE = 3;
+	int CONNECTION_VARIABLE = 5;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingCallImpl <em>Mapping Call</em>}' class.
@@ -136,17 +136,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMappingCall()
 	 * @generated
 	 */
-	int MAPPING_CALL = 10;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingCallBindingImpl <em>Mapping Call Binding</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.MappingCallBindingImpl
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMappingCallBinding()
-	 * @generated
-	 */
-	int MAPPING_CALL_BINDING = 11;
+	int MAPPING_CALL = 14;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingLoopImpl <em>Mapping Loop</em>}' class.
@@ -156,7 +146,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMappingLoop()
 	 * @generated
 	 */
-	int MAPPING_LOOP = 12;
+	int MAPPING_LOOP = 15;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.StatementImpl <em>Statement</em>}' class.
@@ -166,7 +156,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getStatement()
 	 * @generated
 	 */
-	int STATEMENT = 19;
+	int STATEMENT = 24;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.AddStatementImpl <em>Add Statement</em>}' class.
@@ -186,7 +176,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getCheckStatement()
 	 * @generated
 	 */
-	int CHECK_STATEMENT = 2;
+	int CHECK_STATEMENT = 4;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeTypedModelImpl <em>Imperative Typed Model</em>}' class.
@@ -196,7 +186,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getImperativeTypedModel()
 	 * @generated
 	 */
-	int IMPERATIVE_TYPED_MODEL = 7;
+	int IMPERATIVE_TYPED_MODEL = 10;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.LoopVariableImpl <em>Loop Variable</em>}' class.
@@ -206,7 +196,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getLoopVariable()
 	 * @generated
 	 */
-	int LOOP_VARIABLE = 8;
+	int LOOP_VARIABLE = 12;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.VariableStatementImpl <em>Variable Statement</em>}' class.
@@ -216,7 +206,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getVariableStatement()
 	 * @generated
 	 */
-	int VARIABLE_STATEMENT = 20;
+	int VARIABLE_STATEMENT = 25;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -434,7 +424,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getObservableStatement()
 	 * @generated
 	 */
-	int OBSERVABLE_STATEMENT = 16;
+	int OBSERVABLE_STATEMENT = 20;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -617,6 +607,319 @@ public interface QVTimperativePackage extends EPackage {
 	int APPEND_PARAMETER_FEATURE_COUNT = CONNECTION_VARIABLE_FEATURE_COUNT + 0;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingParameterBindingImpl <em>Mapping Parameter Binding</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.MappingParameterBindingImpl
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMappingParameterBinding()
+	 * @generated
+	 */
+	int MAPPING_PARAMETER_BINDING = 17;
+
+	/**
+	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MAPPING_PARAMETER_BINDING__ANNOTATING_COMMENTS = PivotPackage.ELEMENT__ANNOTATING_COMMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MAPPING_PARAMETER_BINDING__OWNED_ANNOTATIONS = PivotPackage.ELEMENT__OWNED_ANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MAPPING_PARAMETER_BINDING__OWNED_COMMENTS = PivotPackage.ELEMENT__OWNED_COMMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MAPPING_PARAMETER_BINDING__OWNED_EXTENSIONS = PivotPackage.ELEMENT__OWNED_EXTENSIONS;
+
+	/**
+	 * The feature id for the '<em><b>Mapping Call</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MAPPING_PARAMETER_BINDING__MAPPING_CALL = PivotPackage.ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Bound Variable</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MAPPING_PARAMETER_BINDING__BOUND_VARIABLE = PivotPackage.ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Mapping Parameter Binding</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MAPPING_PARAMETER_BINDING_FEATURE_COUNT = PivotPackage.ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.DeclareStatementImpl <em>Declare Statement</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.DeclareStatementImpl
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getDeclareStatement()
+	 * @generated
+	 */
+	int DECLARE_STATEMENT = 6;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingParameterImpl <em>Mapping Parameter</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.MappingParameterImpl
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMappingParameter()
+	 * @generated
+	 */
+	int MAPPING_PARAMETER = 16;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.GuardParameterImpl <em>Guard Parameter</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.GuardParameterImpl
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getGuardParameter()
+	 * @generated
+	 */
+	int GUARD_PARAMETER = 7;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.GuardParameterBindingImpl <em>Guard Parameter Binding</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.GuardParameterBindingImpl
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getGuardParameterBinding()
+	 * @generated
+	 */
+	int GUARD_PARAMETER_BINDING = 8;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.AppendParameterBindingImpl <em>Append Parameter Binding</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.AppendParameterBindingImpl
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getAppendParameterBinding()
+	 * @generated
+	 */
+	int APPEND_PARAMETER_BINDING = 2;
+
+	/**
+	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int APPEND_PARAMETER_BINDING__ANNOTATING_COMMENTS = MAPPING_PARAMETER_BINDING__ANNOTATING_COMMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int APPEND_PARAMETER_BINDING__OWNED_ANNOTATIONS = MAPPING_PARAMETER_BINDING__OWNED_ANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int APPEND_PARAMETER_BINDING__OWNED_COMMENTS = MAPPING_PARAMETER_BINDING__OWNED_COMMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int APPEND_PARAMETER_BINDING__OWNED_EXTENSIONS = MAPPING_PARAMETER_BINDING__OWNED_EXTENSIONS;
+
+	/**
+	 * The feature id for the '<em><b>Mapping Call</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int APPEND_PARAMETER_BINDING__MAPPING_CALL = MAPPING_PARAMETER_BINDING__MAPPING_CALL;
+
+	/**
+	 * The feature id for the '<em><b>Bound Variable</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int APPEND_PARAMETER_BINDING__BOUND_VARIABLE = MAPPING_PARAMETER_BINDING__BOUND_VARIABLE;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int APPEND_PARAMETER_BINDING__VALUE = MAPPING_PARAMETER_BINDING_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Append Parameter Binding</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int APPEND_PARAMETER_BINDING_FEATURE_COUNT = MAPPING_PARAMETER_BINDING_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.BufferStatementImpl <em>Buffer Statement</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.BufferStatementImpl
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getBufferStatement()
+	 * @generated
+	 */
+	int BUFFER_STATEMENT = 3;
+
+	/**
+	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUFFER_STATEMENT__ANNOTATING_COMMENTS = CONNECTION_VARIABLE__ANNOTATING_COMMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUFFER_STATEMENT__OWNED_ANNOTATIONS = CONNECTION_VARIABLE__OWNED_ANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUFFER_STATEMENT__OWNED_COMMENTS = CONNECTION_VARIABLE__OWNED_COMMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUFFER_STATEMENT__OWNED_EXTENSIONS = CONNECTION_VARIABLE__OWNED_EXTENSIONS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUFFER_STATEMENT__NAME = CONNECTION_VARIABLE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Is Many</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUFFER_STATEMENT__IS_MANY = CONNECTION_VARIABLE__IS_MANY;
+
+	/**
+	 * The feature id for the '<em><b>Is Required</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUFFER_STATEMENT__IS_REQUIRED = CONNECTION_VARIABLE__IS_REQUIRED;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUFFER_STATEMENT__TYPE = CONNECTION_VARIABLE__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Type Value</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUFFER_STATEMENT__TYPE_VALUE = CONNECTION_VARIABLE__TYPE_VALUE;
+
+	/**
+	 * The feature id for the '<em><b>Observed Properties</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUFFER_STATEMENT__OBSERVED_PROPERTIES = CONNECTION_VARIABLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Owned Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUFFER_STATEMENT__OWNED_EXPRESSION = CONNECTION_VARIABLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Buffer Statement</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUFFER_STATEMENT_FEATURE_COUNT = CONNECTION_VARIABLE_FEATURE_COUNT + 2;
+
+	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -842,16 +1145,6 @@ public interface QVTimperativePackage extends EPackage {
 	int VARIABLE_STATEMENT_FEATURE_COUNT = PivotPackage.VARIABLE_DECLARATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.DeclareStatementImpl <em>Declare Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.DeclareStatementImpl
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getDeclareStatement()
-	 * @generated
-	 */
-	int DECLARE_STATEMENT = 4;
-
-	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -942,13 +1235,13 @@ public interface QVTimperativePackage extends EPackage {
 	int DECLARE_STATEMENT__OBSERVED_PROPERTIES = VARIABLE_STATEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Is Checked</b></em>' attribute.
+	 * The feature id for the '<em><b>Is Check</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DECLARE_STATEMENT__IS_CHECKED = VARIABLE_STATEMENT_FEATURE_COUNT + 1;
+	int DECLARE_STATEMENT__IS_CHECK = VARIABLE_STATEMENT_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Owned Expression</b></em>' containment reference.
@@ -969,16 +1262,6 @@ public interface QVTimperativePackage extends EPackage {
 	int DECLARE_STATEMENT_FEATURE_COUNT = VARIABLE_STATEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingParameterImpl <em>Mapping Parameter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.MappingParameterImpl
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMappingParameter()
-	 * @generated
-	 */
-	int MAPPING_PARAMETER = 13;
-
-	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1069,16 +1352,6 @@ public interface QVTimperativePackage extends EPackage {
 	int MAPPING_PARAMETER_FEATURE_COUNT = PivotPackage.VARIABLE_DECLARATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.GuardParameterImpl <em>Guard Parameter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.GuardParameterImpl
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getGuardParameter()
-	 * @generated
-	 */
-	int GUARD_PARAMETER = 5;
-
-	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1184,6 +1457,87 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
+	int GUARD_PARAMETER_BINDING__ANNOTATING_COMMENTS = MAPPING_PARAMETER_BINDING__ANNOTATING_COMMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GUARD_PARAMETER_BINDING__OWNED_ANNOTATIONS = MAPPING_PARAMETER_BINDING__OWNED_ANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GUARD_PARAMETER_BINDING__OWNED_COMMENTS = MAPPING_PARAMETER_BINDING__OWNED_COMMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GUARD_PARAMETER_BINDING__OWNED_EXTENSIONS = MAPPING_PARAMETER_BINDING__OWNED_EXTENSIONS;
+
+	/**
+	 * The feature id for the '<em><b>Mapping Call</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GUARD_PARAMETER_BINDING__MAPPING_CALL = MAPPING_PARAMETER_BINDING__MAPPING_CALL;
+
+	/**
+	 * The feature id for the '<em><b>Bound Variable</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GUARD_PARAMETER_BINDING__BOUND_VARIABLE = MAPPING_PARAMETER_BINDING__BOUND_VARIABLE;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GUARD_PARAMETER_BINDING__VALUE = MAPPING_PARAMETER_BINDING_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Is Check</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GUARD_PARAMETER_BINDING__IS_CHECK = MAPPING_PARAMETER_BINDING_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Guard Parameter Binding</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GUARD_PARAMETER_BINDING_FEATURE_COUNT = MAPPING_PARAMETER_BINDING_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
 	int IMPERATIVE_MODEL__ANNOTATING_COMMENTS = QVTbasePackage.BASE_MODEL__ANNOTATING_COMMENTS;
 
 	/**
@@ -1376,6 +1730,97 @@ public interface QVTimperativePackage extends EPackage {
 	int IMPERATIVE_TYPED_MODEL_FEATURE_COUNT = QVTbasePackage.TYPED_MODEL_FEATURE_COUNT + 2;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.LoopParameterBindingImpl <em>Loop Parameter Binding</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.LoopParameterBindingImpl
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getLoopParameterBinding()
+	 * @generated
+	 */
+	int LOOP_PARAMETER_BINDING = 11;
+
+	/**
+	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_PARAMETER_BINDING__ANNOTATING_COMMENTS = MAPPING_PARAMETER_BINDING__ANNOTATING_COMMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_PARAMETER_BINDING__OWNED_ANNOTATIONS = MAPPING_PARAMETER_BINDING__OWNED_ANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_PARAMETER_BINDING__OWNED_COMMENTS = MAPPING_PARAMETER_BINDING__OWNED_COMMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_PARAMETER_BINDING__OWNED_EXTENSIONS = MAPPING_PARAMETER_BINDING__OWNED_EXTENSIONS;
+
+	/**
+	 * The feature id for the '<em><b>Mapping Call</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_PARAMETER_BINDING__MAPPING_CALL = MAPPING_PARAMETER_BINDING__MAPPING_CALL;
+
+	/**
+	 * The feature id for the '<em><b>Bound Variable</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_PARAMETER_BINDING__BOUND_VARIABLE = MAPPING_PARAMETER_BINDING__BOUND_VARIABLE;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_PARAMETER_BINDING__VALUE = MAPPING_PARAMETER_BINDING_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Is Check</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_PARAMETER_BINDING__IS_CHECK = MAPPING_PARAMETER_BINDING_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Loop Parameter Binding</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_PARAMETER_BINDING_FEATURE_COUNT = MAPPING_PARAMETER_BINDING_FEATURE_COUNT + 2;
+
+	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1655,94 +2100,40 @@ public interface QVTimperativePackage extends EPackage {
 	int MAPPING_CALL__IS_INFINITE = MAPPING_STATEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Referred Mapping</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING_CALL__REFERRED_MAPPING = MAPPING_STATEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Mapping Call</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING_CALL_FEATURE_COUNT = MAPPING_STATEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
+	 * The feature id for the '<em><b>Is Install</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MAPPING_CALL_BINDING__ANNOTATING_COMMENTS = PivotPackage.ELEMENT__ANNOTATING_COMMENTS;
+	int MAPPING_CALL__IS_INSTALL = MAPPING_STATEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Is Invoke</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MAPPING_CALL_BINDING__OWNED_ANNOTATIONS = PivotPackage.ELEMENT__OWNED_ANNOTATIONS;
+	int MAPPING_CALL__IS_INVOKE = MAPPING_STATEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING_CALL_BINDING__OWNED_COMMENTS = PivotPackage.ELEMENT__OWNED_COMMENTS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING_CALL_BINDING__OWNED_EXTENSIONS = PivotPackage.ELEMENT__OWNED_EXTENSIONS;
-
-	/**
-	 * The feature id for the '<em><b>Bound Variable</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING_CALL_BINDING__BOUND_VARIABLE = PivotPackage.ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Mapping Call</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING_CALL_BINDING__MAPPING_CALL = PivotPackage.ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' containment reference.
+	 * The feature id for the '<em><b>Referred Mapping</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MAPPING_CALL_BINDING__VALUE = PivotPackage.ELEMENT_FEATURE_COUNT + 2;
+	int MAPPING_CALL__REFERRED_MAPPING = MAPPING_STATEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of structural features of the '<em>Mapping Call Binding</em>' class.
+	 * The number of structural features of the '<em>Mapping Call</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MAPPING_CALL_BINDING_FEATURE_COUNT = PivotPackage.ELEMENT_FEATURE_COUNT + 3;
+	int MAPPING_CALL_FEATURE_COUNT = MAPPING_STATEMENT_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -1842,7 +2233,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getNewStatement()
 	 * @generated
 	 */
-	int NEW_STATEMENT = 15;
+	int NEW_STATEMENT = 19;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -1962,14 +2353,14 @@ public interface QVTimperativePackage extends EPackage {
 	int NEW_STATEMENT_FEATURE_COUNT = VARIABLE_STATEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.OutConnectionVariableImpl <em>Out Connection Variable</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.SetStatementImpl <em>Set Statement</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.OutConnectionVariableImpl
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getOutConnectionVariable()
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.SetStatementImpl
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getSetStatement()
 	 * @generated
 	 */
-	int OUT_CONNECTION_VARIABLE = 17;
+	int SET_STATEMENT = 21;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -1978,7 +2369,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int OUT_CONNECTION_VARIABLE__ANNOTATING_COMMENTS = CONNECTION_VARIABLE__ANNOTATING_COMMENTS;
+	int SET_STATEMENT__ANNOTATING_COMMENTS = OBSERVABLE_STATEMENT__ANNOTATING_COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
@@ -1987,7 +2378,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int OUT_CONNECTION_VARIABLE__OWNED_ANNOTATIONS = CONNECTION_VARIABLE__OWNED_ANNOTATIONS;
+	int SET_STATEMENT__OWNED_ANNOTATIONS = OBSERVABLE_STATEMENT__OWNED_ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
@@ -1996,7 +2387,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int OUT_CONNECTION_VARIABLE__OWNED_COMMENTS = CONNECTION_VARIABLE__OWNED_COMMENTS;
+	int SET_STATEMENT__OWNED_COMMENTS = OBSERVABLE_STATEMENT__OWNED_COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
@@ -2005,7 +2396,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int OUT_CONNECTION_VARIABLE__OWNED_EXTENSIONS = CONNECTION_VARIABLE__OWNED_EXTENSIONS;
+	int SET_STATEMENT__OWNED_EXTENSIONS = OBSERVABLE_STATEMENT__OWNED_EXTENSIONS;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -2014,52 +2405,52 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int OUT_CONNECTION_VARIABLE__NAME = CONNECTION_VARIABLE__NAME;
+	int SET_STATEMENT__NAME = OBSERVABLE_STATEMENT__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Is Many</b></em>' attribute.
+	 * The feature id for the '<em><b>Observed Properties</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int OUT_CONNECTION_VARIABLE__IS_MANY = CONNECTION_VARIABLE__IS_MANY;
+	int SET_STATEMENT__OBSERVED_PROPERTIES = OBSERVABLE_STATEMENT__OBSERVED_PROPERTIES;
 
 	/**
-	 * The feature id for the '<em><b>Is Required</b></em>' attribute.
+	 * The feature id for the '<em><b>Target Variable</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int OUT_CONNECTION_VARIABLE__IS_REQUIRED = CONNECTION_VARIABLE__IS_REQUIRED;
+	int SET_STATEMENT__TARGET_VARIABLE = OBSERVABLE_STATEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * The feature id for the '<em><b>Target Property</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int OUT_CONNECTION_VARIABLE__TYPE = CONNECTION_VARIABLE__TYPE;
+	int SET_STATEMENT__TARGET_PROPERTY = OBSERVABLE_STATEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Type Value</b></em>' reference.
+	 * The feature id for the '<em><b>Is Opposite</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int OUT_CONNECTION_VARIABLE__TYPE_VALUE = CONNECTION_VARIABLE__TYPE_VALUE;
+	int SET_STATEMENT__IS_OPPOSITE = OBSERVABLE_STATEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Observed Properties</b></em>' reference list.
+	 * The feature id for the '<em><b>Is Notify</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int OUT_CONNECTION_VARIABLE__OBSERVED_PROPERTIES = CONNECTION_VARIABLE_FEATURE_COUNT + 0;
+	int SET_STATEMENT__IS_NOTIFY = OBSERVABLE_STATEMENT_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Owned Expression</b></em>' containment reference.
@@ -2068,26 +2459,26 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int OUT_CONNECTION_VARIABLE__OWNED_EXPRESSION = CONNECTION_VARIABLE_FEATURE_COUNT + 1;
+	int SET_STATEMENT__OWNED_EXPRESSION = OBSERVABLE_STATEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of structural features of the '<em>Out Connection Variable</em>' class.
+	 * The number of structural features of the '<em>Set Statement</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int OUT_CONNECTION_VARIABLE_FEATURE_COUNT = CONNECTION_VARIABLE_FEATURE_COUNT + 2;
+	int SET_STATEMENT_FEATURE_COUNT = OBSERVABLE_STATEMENT_FEATURE_COUNT + 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.SetStatementImpl <em>Set Statement</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.SimpleParameterImpl <em>Simple Parameter</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.SetStatementImpl
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getSetStatement()
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.SimpleParameterImpl
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getSimpleParameter()
 	 * @generated
 	 */
-	int SET_STATEMENT = 18;
+	int SIMPLE_PARAMETER = 22;
 
 	/**
 	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
@@ -2096,7 +2487,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_STATEMENT__ANNOTATING_COMMENTS = OBSERVABLE_STATEMENT__ANNOTATING_COMMENTS;
+	int SIMPLE_PARAMETER__ANNOTATING_COMMENTS = MAPPING_PARAMETER__ANNOTATING_COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
@@ -2105,7 +2496,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_STATEMENT__OWNED_ANNOTATIONS = OBSERVABLE_STATEMENT__OWNED_ANNOTATIONS;
+	int SIMPLE_PARAMETER__OWNED_ANNOTATIONS = MAPPING_PARAMETER__OWNED_ANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
@@ -2114,7 +2505,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_STATEMENT__OWNED_COMMENTS = OBSERVABLE_STATEMENT__OWNED_COMMENTS;
+	int SIMPLE_PARAMETER__OWNED_COMMENTS = MAPPING_PARAMETER__OWNED_COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
@@ -2123,7 +2514,7 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_STATEMENT__OWNED_EXTENSIONS = OBSERVABLE_STATEMENT__OWNED_EXTENSIONS;
+	int SIMPLE_PARAMETER__OWNED_EXTENSIONS = MAPPING_PARAMETER__OWNED_EXTENSIONS;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -2132,70 +2523,152 @@ public interface QVTimperativePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_STATEMENT__NAME = OBSERVABLE_STATEMENT__NAME;
+	int SIMPLE_PARAMETER__NAME = MAPPING_PARAMETER__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Observed Properties</b></em>' reference list.
+	 * The feature id for the '<em><b>Is Many</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SET_STATEMENT__OBSERVED_PROPERTIES = OBSERVABLE_STATEMENT__OBSERVED_PROPERTIES;
+	int SIMPLE_PARAMETER__IS_MANY = MAPPING_PARAMETER__IS_MANY;
 
 	/**
-	 * The feature id for the '<em><b>Target Variable</b></em>' reference.
+	 * The feature id for the '<em><b>Is Required</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SET_STATEMENT__TARGET_VARIABLE = OBSERVABLE_STATEMENT_FEATURE_COUNT + 0;
+	int SIMPLE_PARAMETER__IS_REQUIRED = MAPPING_PARAMETER__IS_REQUIRED;
 
 	/**
-	 * The feature id for the '<em><b>Target Property</b></em>' reference.
+	 * The feature id for the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SET_STATEMENT__TARGET_PROPERTY = OBSERVABLE_STATEMENT_FEATURE_COUNT + 1;
+	int SIMPLE_PARAMETER__TYPE = MAPPING_PARAMETER__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Is Opposite</b></em>' attribute.
+	 * The feature id for the '<em><b>Type Value</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SET_STATEMENT__IS_OPPOSITE = OBSERVABLE_STATEMENT_FEATURE_COUNT + 2;
+	int SIMPLE_PARAMETER__TYPE_VALUE = MAPPING_PARAMETER__TYPE_VALUE;
 
 	/**
-	 * The feature id for the '<em><b>Is Notify</b></em>' attribute.
+	 * The feature id for the '<em><b>Referred Typed Model</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SET_STATEMENT__IS_NOTIFY = OBSERVABLE_STATEMENT_FEATURE_COUNT + 3;
+	int SIMPLE_PARAMETER__REFERRED_TYPED_MODEL = MAPPING_PARAMETER_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Owned Expression</b></em>' containment reference.
+	 * The number of structural features of the '<em>Simple Parameter</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SET_STATEMENT__OWNED_EXPRESSION = OBSERVABLE_STATEMENT_FEATURE_COUNT + 4;
+	int SIMPLE_PARAMETER_FEATURE_COUNT = MAPPING_PARAMETER_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Set Statement</em>' class.
+	 * The meta object id for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.SimpleParameterBindingImpl <em>Simple Parameter Binding</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.SimpleParameterBindingImpl
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getSimpleParameterBinding()
+	 * @generated
+	 */
+	int SIMPLE_PARAMETER_BINDING = 23;
+
+	/**
+	 * The feature id for the '<em><b>Annotating Comments</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SET_STATEMENT_FEATURE_COUNT = OBSERVABLE_STATEMENT_FEATURE_COUNT + 5;
+	int SIMPLE_PARAMETER_BINDING__ANNOTATING_COMMENTS = MAPPING_PARAMETER_BINDING__ANNOTATING_COMMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Annotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_PARAMETER_BINDING__OWNED_ANNOTATIONS = MAPPING_PARAMETER_BINDING__OWNED_ANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comments</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_PARAMETER_BINDING__OWNED_COMMENTS = MAPPING_PARAMETER_BINDING__OWNED_COMMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Extensions</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_PARAMETER_BINDING__OWNED_EXTENSIONS = MAPPING_PARAMETER_BINDING__OWNED_EXTENSIONS;
+
+	/**
+	 * The feature id for the '<em><b>Mapping Call</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_PARAMETER_BINDING__MAPPING_CALL = MAPPING_PARAMETER_BINDING__MAPPING_CALL;
+
+	/**
+	 * The feature id for the '<em><b>Bound Variable</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_PARAMETER_BINDING__BOUND_VARIABLE = MAPPING_PARAMETER_BINDING__BOUND_VARIABLE;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_PARAMETER_BINDING__VALUE = MAPPING_PARAMETER_BINDING_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Is Check</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_PARAMETER_BINDING__IS_CHECK = MAPPING_PARAMETER_BINDING_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Simple Parameter Binding</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIMPLE_PARAMETER_BINDING_FEATURE_COUNT = MAPPING_PARAMETER_BINDING_FEATURE_COUNT + 2;
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.AddStatement <em>Add Statement</em>}'.
@@ -2251,6 +2724,48 @@ public interface QVTimperativePackage extends EPackage {
 	EClass getAppendParameter();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.AppendParameterBinding <em>Append Parameter Binding</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Append Parameter Binding</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.AppendParameterBinding
+	 * @generated
+	 */
+	EClass getAppendParameterBinding();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.qvtd.pivot.qvtimperative.AppendParameterBinding#getValue <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Value</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.AppendParameterBinding#getValue()
+	 * @see #getAppendParameterBinding()
+	 * @generated
+	 */
+	EReference getAppendParameterBinding_Value();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.BufferStatement <em>Buffer Statement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Buffer Statement</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.BufferStatement
+	 * @generated
+	 */
+	EClass getBufferStatement();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.qvtd.pivot.qvtimperative.BufferStatement#getOwnedExpression <em>Owned Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Owned Expression</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.BufferStatement#getOwnedExpression()
+	 * @see #getBufferStatement()
+	 * @generated
+	 */
+	EReference getBufferStatement_OwnedExpression();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.CheckStatement <em>Check Statement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2292,15 +2807,15 @@ public interface QVTimperativePackage extends EPackage {
 	EClass getDeclareStatement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.qvtd.pivot.qvtimperative.DeclareStatement#isIsChecked <em>Is Checked</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.qvtd.pivot.qvtimperative.DeclareStatement#isIsCheck <em>Is Check</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is Checked</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.DeclareStatement#isIsChecked()
+	 * @return the meta object for the attribute '<em>Is Check</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.DeclareStatement#isIsCheck()
 	 * @see #getDeclareStatement()
 	 * @generated
 	 */
-	EAttribute getDeclareStatement_IsChecked();
+	EAttribute getDeclareStatement_IsCheck();
 
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.qvtd.pivot.qvtimperative.DeclareStatement#getOwnedExpression <em>Owned Expression</em>}'.
@@ -2335,6 +2850,38 @@ public interface QVTimperativePackage extends EPackage {
 	EReference getGuardParameter_ReferredTypedModel();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding <em>Guard Parameter Binding</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Guard Parameter Binding</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding
+	 * @generated
+	 */
+	EClass getGuardParameterBinding();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding#getValue <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Value</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding#getValue()
+	 * @see #getGuardParameterBinding()
+	 * @generated
+	 */
+	EReference getGuardParameterBinding_Value();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding#isIsCheck <em>Is Check</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is Check</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding#isIsCheck()
+	 * @see #getGuardParameterBinding()
+	 * @generated
+	 */
+	EAttribute getGuardParameterBinding_IsCheck();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel <em>Imperative Model</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2377,6 +2924,38 @@ public interface QVTimperativePackage extends EPackage {
 	EAttribute getImperativeTypedModel_IsEnforced();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.LoopParameterBinding <em>Loop Parameter Binding</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Loop Parameter Binding</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.LoopParameterBinding
+	 * @generated
+	 */
+	EClass getLoopParameterBinding();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.qvtd.pivot.qvtimperative.LoopParameterBinding#getValue <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Value</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.LoopParameterBinding#getValue()
+	 * @see #getLoopParameterBinding()
+	 * @generated
+	 */
+	EReference getLoopParameterBinding_Value();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.qvtd.pivot.qvtimperative.LoopParameterBinding#isIsCheck <em>Is Check</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is Check</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.LoopParameterBinding#isIsCheck()
+	 * @see #getLoopParameterBinding()
+	 * @generated
+	 */
+	EAttribute getLoopParameterBinding_IsCheck();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.LoopVariable <em>Loop Variable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2473,47 +3052,26 @@ public interface QVTimperativePackage extends EPackage {
 	EAttribute getMappingCall_IsInfinite();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding <em>Mapping Call Binding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Mapping Call Binding</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding
-	 * @generated
-	 */
-	EClass getMappingCallBinding();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding#getMappingCall <em>Mapping Call</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCall#isIsInstall <em>Is Install</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Mapping Call</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding#getMappingCall()
-	 * @see #getMappingCallBinding()
-	 * @generated
-	 */
-	EReference getMappingCallBinding_MappingCall();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding#getBoundVariable <em>Bound Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Bound Variable</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding#getBoundVariable()
-	 * @see #getMappingCallBinding()
+	 * @return the meta object for the attribute '<em>Is Install</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingCall#isIsInstall()
+	 * @see #getMappingCall()
 	 * @generated
 	 */
-	EReference getMappingCallBinding_BoundVariable();
+	EAttribute getMappingCall_IsInstall();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding#getValue <em>Value</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCall#isIsInvoke <em>Is Invoke</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Value</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding#getValue()
-	 * @see #getMappingCallBinding()
+	 * @return the meta object for the attribute '<em>Is Invoke</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingCall#isIsInvoke()
+	 * @see #getMappingCall()
 	 * @generated
 	 */
-	EReference getMappingCallBinding_Value();
+	EAttribute getMappingCall_IsInvoke();
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingLoop <em>Mapping Loop</em>}'.
@@ -2569,6 +3127,38 @@ public interface QVTimperativePackage extends EPackage {
 	EClass getMappingParameter();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding <em>Mapping Parameter Binding</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Mapping Parameter Binding</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding
+	 * @generated
+	 */
+	EClass getMappingParameterBinding();
+
+	/**
+	 * Returns the meta object for the container reference '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding#getMappingCall <em>Mapping Call</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Mapping Call</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding#getMappingCall()
+	 * @see #getMappingParameterBinding()
+	 * @generated
+	 */
+	EReference getMappingParameterBinding_MappingCall();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding#getBoundVariable <em>Bound Variable</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Bound Variable</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding#getBoundVariable()
+	 * @see #getMappingParameterBinding()
+	 * @generated
+	 */
+	EReference getMappingParameterBinding_BoundVariable();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingStatement <em>Mapping Statement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2632,27 +3222,6 @@ public interface QVTimperativePackage extends EPackage {
 	EReference getObservableStatement_ObservedProperties();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.OutConnectionVariable <em>Out Connection Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Out Connection Variable</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.OutConnectionVariable
-	 * @generated
-	 */
-	EClass getOutConnectionVariable();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.qvtd.pivot.qvtimperative.OutConnectionVariable#getOwnedExpression <em>Owned Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Owned Expression</em>'.
-	 * @see org.eclipse.qvtd.pivot.qvtimperative.OutConnectionVariable#getOwnedExpression()
-	 * @see #getOutConnectionVariable()
-	 * @generated
-	 */
-	EReference getOutConnectionVariable_OwnedExpression();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.SetStatement <em>Set Statement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2718,6 +3287,59 @@ public interface QVTimperativePackage extends EPackage {
 	EReference getSetStatement_OwnedExpression();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.SimpleParameter <em>Simple Parameter</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Simple Parameter</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.SimpleParameter
+	 * @generated
+	 */
+	EClass getSimpleParameter();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.qvtd.pivot.qvtimperative.SimpleParameter#getReferredTypedModel <em>Referred Typed Model</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Referred Typed Model</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.SimpleParameter#getReferredTypedModel()
+	 * @see #getSimpleParameter()
+	 * @generated
+	 */
+	EReference getSimpleParameter_ReferredTypedModel();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding <em>Simple Parameter Binding</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Simple Parameter Binding</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding
+	 * @generated
+	 */
+	EClass getSimpleParameterBinding();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding#getValue <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Value</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding#getValue()
+	 * @see #getSimpleParameterBinding()
+	 * @generated
+	 */
+	EReference getSimpleParameterBinding_Value();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding#isIsCheck <em>Is Check</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is Check</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding#isIsCheck()
+	 * @see #getSimpleParameterBinding()
+	 * @generated
+	 */
+	EAttribute getSimpleParameterBinding_IsCheck();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.qvtd.pivot.qvtimperative.Statement <em>Statement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2804,6 +3426,42 @@ public interface QVTimperativePackage extends EPackage {
 		EClass APPEND_PARAMETER = eINSTANCE.getAppendParameter();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.AppendParameterBindingImpl <em>Append Parameter Binding</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.AppendParameterBindingImpl
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getAppendParameterBinding()
+		 * @generated
+		 */
+		EClass APPEND_PARAMETER_BINDING = eINSTANCE.getAppendParameterBinding();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference APPEND_PARAMETER_BINDING__VALUE = eINSTANCE.getAppendParameterBinding_Value();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.BufferStatementImpl <em>Buffer Statement</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.BufferStatementImpl
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getBufferStatement()
+		 * @generated
+		 */
+		EClass BUFFER_STATEMENT = eINSTANCE.getBufferStatement();
+
+		/**
+		 * The meta object literal for the '<em><b>Owned Expression</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference BUFFER_STATEMENT__OWNED_EXPRESSION = eINSTANCE.getBufferStatement_OwnedExpression();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.CheckStatementImpl <em>Check Statement</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -2842,12 +3500,12 @@ public interface QVTimperativePackage extends EPackage {
 		EClass DECLARE_STATEMENT = eINSTANCE.getDeclareStatement();
 
 		/**
-		 * The meta object literal for the '<em><b>Is Checked</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Is Check</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute DECLARE_STATEMENT__IS_CHECKED = eINSTANCE.getDeclareStatement_IsChecked();
+		EAttribute DECLARE_STATEMENT__IS_CHECK = eINSTANCE.getDeclareStatement_IsCheck();
 
 		/**
 		 * The meta object literal for the '<em><b>Owned Expression</b></em>' containment reference feature.
@@ -2876,6 +3534,32 @@ public interface QVTimperativePackage extends EPackage {
 		EReference GUARD_PARAMETER__REFERRED_TYPED_MODEL = eINSTANCE.getGuardParameter_ReferredTypedModel();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.GuardParameterBindingImpl <em>Guard Parameter Binding</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.GuardParameterBindingImpl
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getGuardParameterBinding()
+		 * @generated
+		 */
+		EClass GUARD_PARAMETER_BINDING = eINSTANCE.getGuardParameterBinding();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference GUARD_PARAMETER_BINDING__VALUE = eINSTANCE.getGuardParameterBinding_Value();
+
+		/**
+		 * The meta object literal for the '<em><b>Is Check</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute GUARD_PARAMETER_BINDING__IS_CHECK = eINSTANCE.getGuardParameterBinding_IsCheck();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.ImperativeModelImpl <em>Imperative Model</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -2912,6 +3596,32 @@ public interface QVTimperativePackage extends EPackage {
 		EAttribute IMPERATIVE_TYPED_MODEL__IS_ENFORCED = eINSTANCE.getImperativeTypedModel_IsEnforced();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.LoopParameterBindingImpl <em>Loop Parameter Binding</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.LoopParameterBindingImpl
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getLoopParameterBinding()
+		 * @generated
+		 */
+		EClass LOOP_PARAMETER_BINDING = eINSTANCE.getLoopParameterBinding();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LOOP_PARAMETER_BINDING__VALUE = eINSTANCE.getLoopParameterBinding_Value();
+
+		/**
+		 * The meta object literal for the '<em><b>Is Check</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute LOOP_PARAMETER_BINDING__IS_CHECK = eINSTANCE.getLoopParameterBinding_IsCheck();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.LoopVariableImpl <em>Loop Variable</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -2990,38 +3700,20 @@ public interface QVTimperativePackage extends EPackage {
 		EAttribute MAPPING_CALL__IS_INFINITE = eINSTANCE.getMappingCall_IsInfinite();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingCallBindingImpl <em>Mapping Call Binding</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.MappingCallBindingImpl
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMappingCallBinding()
-		 * @generated
-		 */
-		EClass MAPPING_CALL_BINDING = eINSTANCE.getMappingCallBinding();
-
-		/**
-		 * The meta object literal for the '<em><b>Mapping Call</b></em>' container reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MAPPING_CALL_BINDING__MAPPING_CALL = eINSTANCE.getMappingCallBinding_MappingCall();
-
-		/**
-		 * The meta object literal for the '<em><b>Bound Variable</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Is Install</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference MAPPING_CALL_BINDING__BOUND_VARIABLE = eINSTANCE.getMappingCallBinding_BoundVariable();
+		EAttribute MAPPING_CALL__IS_INSTALL = eINSTANCE.getMappingCall_IsInstall();
 
 		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
+		 * The meta object literal for the '<em><b>Is Invoke</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference MAPPING_CALL_BINDING__VALUE = eINSTANCE.getMappingCallBinding_Value();
+		EAttribute MAPPING_CALL__IS_INVOKE = eINSTANCE.getMappingCall_IsInvoke();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingLoopImpl <em>Mapping Loop</em>}' class.
@@ -3068,6 +3760,32 @@ public interface QVTimperativePackage extends EPackage {
 		EClass MAPPING_PARAMETER = eINSTANCE.getMappingParameter();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingParameterBindingImpl <em>Mapping Parameter Binding</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.MappingParameterBindingImpl
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getMappingParameterBinding()
+		 * @generated
+		 */
+		EClass MAPPING_PARAMETER_BINDING = eINSTANCE.getMappingParameterBinding();
+
+		/**
+		 * The meta object literal for the '<em><b>Mapping Call</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MAPPING_PARAMETER_BINDING__MAPPING_CALL = eINSTANCE.getMappingParameterBinding_MappingCall();
+
+		/**
+		 * The meta object literal for the '<em><b>Bound Variable</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MAPPING_PARAMETER_BINDING__BOUND_VARIABLE = eINSTANCE.getMappingParameterBinding_BoundVariable();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingStatementImpl <em>Mapping Statement</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -3122,24 +3840,6 @@ public interface QVTimperativePackage extends EPackage {
 		EReference OBSERVABLE_STATEMENT__OBSERVED_PROPERTIES = eINSTANCE.getObservableStatement_ObservedProperties();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.OutConnectionVariableImpl <em>Out Connection Variable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.OutConnectionVariableImpl
-		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getOutConnectionVariable()
-		 * @generated
-		 */
-		EClass OUT_CONNECTION_VARIABLE = eINSTANCE.getOutConnectionVariable();
-
-		/**
-		 * The meta object literal for the '<em><b>Owned Expression</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference OUT_CONNECTION_VARIABLE__OWNED_EXPRESSION = eINSTANCE.getOutConnectionVariable_OwnedExpression();
-
-		/**
 		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.SetStatementImpl <em>Set Statement</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -3190,6 +3890,50 @@ public interface QVTimperativePackage extends EPackage {
 		EReference SET_STATEMENT__OWNED_EXPRESSION = eINSTANCE.getSetStatement_OwnedExpression();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.SimpleParameterImpl <em>Simple Parameter</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.SimpleParameterImpl
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getSimpleParameter()
+		 * @generated
+		 */
+		EClass SIMPLE_PARAMETER = eINSTANCE.getSimpleParameter();
+
+		/**
+		 * The meta object literal for the '<em><b>Referred Typed Model</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SIMPLE_PARAMETER__REFERRED_TYPED_MODEL = eINSTANCE.getSimpleParameter_ReferredTypedModel();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.SimpleParameterBindingImpl <em>Simple Parameter Binding</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.SimpleParameterBindingImpl
+		 * @see org.eclipse.qvtd.pivot.qvtimperative.impl.QVTimperativePackageImpl#getSimpleParameterBinding()
+		 * @generated
+		 */
+		EClass SIMPLE_PARAMETER_BINDING = eINSTANCE.getSimpleParameterBinding();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SIMPLE_PARAMETER_BINDING__VALUE = eINSTANCE.getSimpleParameterBinding_Value();
+
+		/**
+		 * The meta object literal for the '<em><b>Is Check</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SIMPLE_PARAMETER_BINDING__IS_CHECK = eINSTANCE.getSimpleParameterBinding_IsCheck();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.qvtd.pivot.qvtimperative.impl.StatementImpl <em>Statement</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/SimpleParameter.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/SimpleParameter.java
new file mode 100644
index 000000000..069b45821
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/SimpleParameter.java
@@ -0,0 +1,63 @@
+/**
+ * <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;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Simple Parameter</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * A ConnectionVariable accumulates one or more assignments.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.SimpleParameter#getReferredTypedModel <em>Referred Typed Model</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getSimpleParameter()
+ * @generated
+ */
+public interface SimpleParameter extends MappingParameter {
+	/**
+	 * 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>' 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(ImperativeTypedModel)
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getSimpleParameter_ReferredTypedModel()
+	 * @generated
+	 */
+	ImperativeTypedModel getReferredTypedModel();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.SimpleParameter#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(ImperativeTypedModel value);
+
+} // SimpleParameter
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/SimpleParameterBinding.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/SimpleParameterBinding.java
new file mode 100644
index 000000000..134180fcd
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/SimpleParameterBinding.java
@@ -0,0 +1,92 @@
+/**
+ * <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.OCLExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Simple Parameter Binding</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * A MappingCallBinding specifies the binding of a single variable as part of
+ * a MappingCall. A value is bound to the variable. OPtionally isLoop may be true
+ * to indicate that the value is a collection of values, each of which is to
+ * be used as part of a distinct invocation.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding#isIsCheck <em>Is Check</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getSimpleParameterBinding()
+ * @generated
+ */
+public interface SimpleParameterBinding extends MappingParameterBinding {
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * The value or collection of values to bind to boundVariable
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Value</em>' containment reference.
+	 * @see #setValue(OCLExpression)
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getSimpleParameterBinding_Value()
+	 * @generated
+	 */
+	OCLExpression getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding#getValue <em>Value</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Value</em>' containment reference.
+	 * @see #getValue()
+	 * @generated
+	 */
+	void setValue(OCLExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Is Check</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Whether the variable initialization needs to be checked as a predicate. This is a derivation of not ownedInit.type.conformsTo(self.type).
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Is Check</em>' attribute.
+	 * @see #setIsCheck(boolean)
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage#getSimpleParameterBinding_IsCheck()
+	 * @generated
+	 */
+	boolean isIsCheck();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding#isIsCheck <em>Is Check</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is Check</em>' attribute.
+	 * @see #isIsCheck()
+	 * @generated
+	 */
+	void setIsCheck(boolean value);
+
+} // SimpleParameterBinding
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/AppendParameterBindingImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/AppendParameterBindingImpl.java
new file mode 100644
index 000000000..4520e89a3
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/AppendParameterBindingImpl.java
@@ -0,0 +1,180 @@
+/**
+ * <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.util.Visitor;
+import org.eclipse.qvtd.pivot.qvtimperative.AppendParameterBinding;
+import org.eclipse.qvtd.pivot.qvtimperative.ConnectionVariable;
+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>Append Parameter Binding</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.AppendParameterBindingImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class AppendParameterBindingImpl extends MappingParameterBindingImpl implements AppendParameterBinding {
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected ConnectionVariable value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AppendParameterBindingImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return QVTimperativePackage.Literals.APPEND_PARAMETER_BINDING;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ConnectionVariable getValue() {
+		if (value != null && value.eIsProxy()) {
+			InternalEObject oldValue = (InternalEObject)value;
+			value = (ConnectionVariable)eResolveProxy(oldValue);
+			if (value != oldValue) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, QVTimperativePackage.APPEND_PARAMETER_BINDING__VALUE, oldValue, value));
+			}
+		}
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ConnectionVariable basicGetValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setValue(ConnectionVariable newValue) {
+		ConnectionVariable oldValue = value;
+		value = newValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.APPEND_PARAMETER_BINDING__VALUE, oldValue, value));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case QVTimperativePackage.APPEND_PARAMETER_BINDING__VALUE:
+				if (resolve) return getValue();
+				return basicGetValue();
+		}
+		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.APPEND_PARAMETER_BINDING__VALUE:
+				setValue((ConnectionVariable)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case QVTimperativePackage.APPEND_PARAMETER_BINDING__VALUE:
+				setValue((ConnectionVariable)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case QVTimperativePackage.APPEND_PARAMETER_BINDING__VALUE:
+				return value != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public <R> R accept(@NonNull Visitor<R> visitor) {
+		return (R) ((QVTimperativeVisitor<?>)visitor).visitAppendParameterBinding(this);
+	}
+
+} //AppendParameterBindingImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/OutConnectionVariableImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/BufferStatementImpl.java
index 890cede16..c899ca039 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/OutConnectionVariableImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/BufferStatementImpl.java
@@ -27,8 +27,8 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.ocl.pivot.OCLExpression;
 import org.eclipse.ocl.pivot.Property;
 import org.eclipse.ocl.pivot.util.Visitor;
+import org.eclipse.qvtd.pivot.qvtimperative.BufferStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.ObservableStatement;
-import org.eclipse.qvtd.pivot.qvtimperative.OutConnectionVariable;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
 import org.eclipse.qvtd.pivot.qvtimperative.Statement;
 import org.eclipse.qvtd.pivot.qvtimperative.VariableStatement;
@@ -36,19 +36,19 @@ import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Out Connection Variable</b></em>'.
+ * An implementation of the model object '<em><b>Buffer Statement</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.OutConnectionVariableImpl#getObservedProperties <em>Observed Properties</em>}</li>
- *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.OutConnectionVariableImpl#getOwnedExpression <em>Owned Expression</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.BufferStatementImpl#getObservedProperties <em>Observed Properties</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.BufferStatementImpl#getOwnedExpression <em>Owned Expression</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class OutConnectionVariableImpl extends ConnectionVariableImpl implements OutConnectionVariable {
+public class BufferStatementImpl extends ConnectionVariableImpl implements BufferStatement {
 	/**
 	 * The cached value of the '{@link #getObservedProperties() <em>Observed Properties</em>}' reference list.
 	 * <!-- begin-user-doc -->
@@ -58,6 +58,7 @@ public class OutConnectionVariableImpl extends ConnectionVariableImpl implements
 	 * @ordered
 	 */
 	protected EList<Property> observedProperties;
+
 	/**
 	 * The cached value of the '{@link #getOwnedExpression() <em>Owned Expression</em>}' containment reference.
 	 * <!-- begin-user-doc -->
@@ -67,12 +68,13 @@ public class OutConnectionVariableImpl extends ConnectionVariableImpl implements
 	 * @ordered
 	 */
 	protected OCLExpression ownedExpression;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected OutConnectionVariableImpl() {
+	protected BufferStatementImpl() {
 		super();
 	}
 
@@ -83,7 +85,7 @@ public class OutConnectionVariableImpl extends ConnectionVariableImpl implements
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return QVTimperativePackage.Literals.OUT_CONNECTION_VARIABLE;
+		return QVTimperativePackage.Literals.BUFFER_STATEMENT;
 	}
 
 	/**
@@ -94,7 +96,7 @@ public class OutConnectionVariableImpl extends ConnectionVariableImpl implements
 	@Override
 	public EList<Property> getObservedProperties() {
 		if (observedProperties == null) {
-			observedProperties = new EObjectResolvingEList<Property>(Property.class, this, QVTimperativePackage.OUT_CONNECTION_VARIABLE__OBSERVED_PROPERTIES);
+			observedProperties = new EObjectResolvingEList<Property>(Property.class, this, QVTimperativePackage.BUFFER_STATEMENT__OBSERVED_PROPERTIES);
 		}
 		return observedProperties;
 	}
@@ -118,7 +120,7 @@ public class OutConnectionVariableImpl extends ConnectionVariableImpl implements
 		OCLExpression oldOwnedExpression = ownedExpression;
 		ownedExpression = newOwnedExpression;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, QVTimperativePackage.OUT_CONNECTION_VARIABLE__OWNED_EXPRESSION, oldOwnedExpression, newOwnedExpression);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, QVTimperativePackage.BUFFER_STATEMENT__OWNED_EXPRESSION, oldOwnedExpression, newOwnedExpression);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -134,14 +136,14 @@ public class OutConnectionVariableImpl extends ConnectionVariableImpl implements
 		if (newOwnedExpression != ownedExpression) {
 			NotificationChain msgs = null;
 			if (ownedExpression != null)
-				msgs = ((InternalEObject)ownedExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - QVTimperativePackage.OUT_CONNECTION_VARIABLE__OWNED_EXPRESSION, null, msgs);
+				msgs = ((InternalEObject)ownedExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - QVTimperativePackage.BUFFER_STATEMENT__OWNED_EXPRESSION, null, msgs);
 			if (newOwnedExpression != null)
-				msgs = ((InternalEObject)newOwnedExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - QVTimperativePackage.OUT_CONNECTION_VARIABLE__OWNED_EXPRESSION, null, msgs);
+				msgs = ((InternalEObject)newOwnedExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - QVTimperativePackage.BUFFER_STATEMENT__OWNED_EXPRESSION, null, msgs);
 			msgs = basicSetOwnedExpression(newOwnedExpression, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.OUT_CONNECTION_VARIABLE__OWNED_EXPRESSION, newOwnedExpression, newOwnedExpression));
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.BUFFER_STATEMENT__OWNED_EXPRESSION, newOwnedExpression, newOwnedExpression));
 	}
 
 	/**
@@ -152,7 +154,7 @@ public class OutConnectionVariableImpl extends ConnectionVariableImpl implements
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case QVTimperativePackage.OUT_CONNECTION_VARIABLE__OWNED_EXPRESSION:
+			case QVTimperativePackage.BUFFER_STATEMENT__OWNED_EXPRESSION:
 				return basicSetOwnedExpression(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -166,9 +168,9 @@ public class OutConnectionVariableImpl extends ConnectionVariableImpl implements
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case QVTimperativePackage.OUT_CONNECTION_VARIABLE__OBSERVED_PROPERTIES:
+			case QVTimperativePackage.BUFFER_STATEMENT__OBSERVED_PROPERTIES:
 				return getObservedProperties();
-			case QVTimperativePackage.OUT_CONNECTION_VARIABLE__OWNED_EXPRESSION:
+			case QVTimperativePackage.BUFFER_STATEMENT__OWNED_EXPRESSION:
 				return getOwnedExpression();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -183,11 +185,11 @@ public class OutConnectionVariableImpl extends ConnectionVariableImpl implements
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case QVTimperativePackage.OUT_CONNECTION_VARIABLE__OBSERVED_PROPERTIES:
+			case QVTimperativePackage.BUFFER_STATEMENT__OBSERVED_PROPERTIES:
 				getObservedProperties().clear();
 				getObservedProperties().addAll((Collection<? extends Property>)newValue);
 				return;
-			case QVTimperativePackage.OUT_CONNECTION_VARIABLE__OWNED_EXPRESSION:
+			case QVTimperativePackage.BUFFER_STATEMENT__OWNED_EXPRESSION:
 				setOwnedExpression((OCLExpression)newValue);
 				return;
 		}
@@ -202,10 +204,10 @@ public class OutConnectionVariableImpl extends ConnectionVariableImpl implements
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case QVTimperativePackage.OUT_CONNECTION_VARIABLE__OBSERVED_PROPERTIES:
+			case QVTimperativePackage.BUFFER_STATEMENT__OBSERVED_PROPERTIES:
 				getObservedProperties().clear();
 				return;
-			case QVTimperativePackage.OUT_CONNECTION_VARIABLE__OWNED_EXPRESSION:
+			case QVTimperativePackage.BUFFER_STATEMENT__OWNED_EXPRESSION:
 				setOwnedExpression((OCLExpression)null);
 				return;
 		}
@@ -220,9 +222,9 @@ public class OutConnectionVariableImpl extends ConnectionVariableImpl implements
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case QVTimperativePackage.OUT_CONNECTION_VARIABLE__OBSERVED_PROPERTIES:
+			case QVTimperativePackage.BUFFER_STATEMENT__OBSERVED_PROPERTIES:
 				return observedProperties != null && !observedProperties.isEmpty();
-			case QVTimperativePackage.OUT_CONNECTION_VARIABLE__OWNED_EXPRESSION:
+			case QVTimperativePackage.BUFFER_STATEMENT__OWNED_EXPRESSION:
 				return ownedExpression != null;
 		}
 		return super.eIsSet(featureID);
@@ -247,7 +249,7 @@ public class OutConnectionVariableImpl extends ConnectionVariableImpl implements
 		}
 		if (baseClass == ObservableStatement.class) {
 			switch (derivedFeatureID) {
-				case QVTimperativePackage.OUT_CONNECTION_VARIABLE__OBSERVED_PROPERTIES: return QVTimperativePackage.OBSERVABLE_STATEMENT__OBSERVED_PROPERTIES;
+				case QVTimperativePackage.BUFFER_STATEMENT__OBSERVED_PROPERTIES: return QVTimperativePackage.OBSERVABLE_STATEMENT__OBSERVED_PROPERTIES;
 				default: return -1;
 			}
 		}
@@ -273,7 +275,7 @@ public class OutConnectionVariableImpl extends ConnectionVariableImpl implements
 		}
 		if (baseClass == ObservableStatement.class) {
 			switch (baseFeatureID) {
-				case QVTimperativePackage.OBSERVABLE_STATEMENT__OBSERVED_PROPERTIES: return QVTimperativePackage.OUT_CONNECTION_VARIABLE__OBSERVED_PROPERTIES;
+				case QVTimperativePackage.OBSERVABLE_STATEMENT__OBSERVED_PROPERTIES: return QVTimperativePackage.BUFFER_STATEMENT__OBSERVED_PROPERTIES;
 				default: return -1;
 			}
 		}
@@ -287,7 +289,7 @@ public class OutConnectionVariableImpl extends ConnectionVariableImpl implements
 	@SuppressWarnings("unchecked")
 	@Override
 	public <R> R accept(@NonNull Visitor<R> visitor) {
-		return (R) ((QVTimperativeVisitor<?>)visitor).visitOutConnectionVariable(this);
+		return (R) ((QVTimperativeVisitor<?>)visitor).visitBufferStatement(this);
 	}
 
-} //OutConnectionVariableImpl
+} //BufferStatementImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/DeclareStatementImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/DeclareStatementImpl.java
index 12e085450..c66f5bc35 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/DeclareStatementImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/DeclareStatementImpl.java
@@ -41,7 +41,7 @@ import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
  * </p>
  * <ul>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.DeclareStatementImpl#getObservedProperties <em>Observed Properties</em>}</li>
- *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.DeclareStatementImpl#isIsChecked <em>Is Checked</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.DeclareStatementImpl#isIsCheck <em>Is Check</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.DeclareStatementImpl#getOwnedExpression <em>Owned Expression</em>}</li>
  * </ul>
  *
@@ -59,24 +59,24 @@ public class DeclareStatementImpl extends VariableStatementImpl implements Decla
 	protected EList<Property> observedProperties;
 
 	/**
-	 * The default value of the '{@link #isIsChecked() <em>Is Checked</em>}' attribute.
+	 * The default value of the '{@link #isIsCheck() <em>Is Check</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isIsChecked()
+	 * @see #isIsCheck()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final boolean IS_CHECKED_EDEFAULT = false;
+	protected static final boolean IS_CHECK_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isIsChecked() <em>Is Checked</em>}' attribute.
+	 * The cached value of the '{@link #isIsCheck() <em>Is Check</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isIsChecked()
+	 * @see #isIsCheck()
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean isChecked = IS_CHECKED_EDEFAULT;
+	protected boolean isCheck = IS_CHECK_EDEFAULT;
 
 	/**
 	 * The cached value of the '{@link #getOwnedExpression() <em>Owned Expression</em>}' containment reference.
@@ -126,8 +126,8 @@ public class DeclareStatementImpl extends VariableStatementImpl implements Decla
 	 * @generated
 	 */
 	@Override
-	public boolean isIsChecked() {
-		return isChecked;
+	public boolean isIsCheck() {
+		return isCheck;
 	}
 
 	/**
@@ -136,11 +136,11 @@ public class DeclareStatementImpl extends VariableStatementImpl implements Decla
 	 * @generated
 	 */
 	@Override
-	public void setIsChecked(boolean newIsChecked) {
-		boolean oldIsChecked = isChecked;
-		isChecked = newIsChecked;
+	public void setIsCheck(boolean newIsCheck) {
+		boolean oldIsCheck = isCheck;
+		isCheck = newIsCheck;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.DECLARE_STATEMENT__IS_CHECKED, oldIsChecked, isChecked));
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.DECLARE_STATEMENT__IS_CHECK, oldIsCheck, isCheck));
 	}
 
 	/**
@@ -222,8 +222,8 @@ public class DeclareStatementImpl extends VariableStatementImpl implements Decla
 		switch (featureID) {
 			case QVTimperativePackage.DECLARE_STATEMENT__OBSERVED_PROPERTIES:
 				return getObservedProperties();
-			case QVTimperativePackage.DECLARE_STATEMENT__IS_CHECKED:
-				return isIsChecked();
+			case QVTimperativePackage.DECLARE_STATEMENT__IS_CHECK:
+				return isIsCheck();
 			case QVTimperativePackage.DECLARE_STATEMENT__OWNED_EXPRESSION:
 				return getOwnedExpression();
 		}
@@ -243,8 +243,8 @@ public class DeclareStatementImpl extends VariableStatementImpl implements Decla
 				getObservedProperties().clear();
 				getObservedProperties().addAll((Collection<? extends Property>)newValue);
 				return;
-			case QVTimperativePackage.DECLARE_STATEMENT__IS_CHECKED:
-				setIsChecked((Boolean)newValue);
+			case QVTimperativePackage.DECLARE_STATEMENT__IS_CHECK:
+				setIsCheck((Boolean)newValue);
 				return;
 			case QVTimperativePackage.DECLARE_STATEMENT__OWNED_EXPRESSION:
 				setOwnedExpression((OCLExpression)newValue);
@@ -264,8 +264,8 @@ public class DeclareStatementImpl extends VariableStatementImpl implements Decla
 			case QVTimperativePackage.DECLARE_STATEMENT__OBSERVED_PROPERTIES:
 				getObservedProperties().clear();
 				return;
-			case QVTimperativePackage.DECLARE_STATEMENT__IS_CHECKED:
-				setIsChecked(IS_CHECKED_EDEFAULT);
+			case QVTimperativePackage.DECLARE_STATEMENT__IS_CHECK:
+				setIsCheck(IS_CHECK_EDEFAULT);
 				return;
 			case QVTimperativePackage.DECLARE_STATEMENT__OWNED_EXPRESSION:
 				setOwnedExpression((OCLExpression)null);
@@ -284,8 +284,8 @@ public class DeclareStatementImpl extends VariableStatementImpl implements Decla
 		switch (featureID) {
 			case QVTimperativePackage.DECLARE_STATEMENT__OBSERVED_PROPERTIES:
 				return observedProperties != null && !observedProperties.isEmpty();
-			case QVTimperativePackage.DECLARE_STATEMENT__IS_CHECKED:
-				return isChecked != IS_CHECKED_EDEFAULT;
+			case QVTimperativePackage.DECLARE_STATEMENT__IS_CHECK:
+				return isCheck != IS_CHECK_EDEFAULT;
 			case QVTimperativePackage.DECLARE_STATEMENT__OWNED_EXPRESSION:
 				return ownedExpression != null;
 		}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/GuardParameterBindingImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/GuardParameterBindingImpl.java
new file mode 100644
index 000000000..f60440304
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/GuardParameterBindingImpl.java
@@ -0,0 +1,244 @@
+/**
+ * <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.util.Visitor;
+import org.eclipse.qvtd.pivot.qvtimperative.ConnectionVariable;
+import org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding;
+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>Guard Parameter Binding</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.GuardParameterBindingImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.GuardParameterBindingImpl#isIsCheck <em>Is Check</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class GuardParameterBindingImpl extends MappingParameterBindingImpl implements GuardParameterBinding {
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected ConnectionVariable value;
+
+	/**
+	 * The default value of the '{@link #isIsCheck() <em>Is Check</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIsCheck()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_CHECK_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIsCheck() <em>Is Check</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIsCheck()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean isCheck = IS_CHECK_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected GuardParameterBindingImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return QVTimperativePackage.Literals.GUARD_PARAMETER_BINDING;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ConnectionVariable getValue() {
+		if (value != null && value.eIsProxy()) {
+			InternalEObject oldValue = (InternalEObject)value;
+			value = (ConnectionVariable)eResolveProxy(oldValue);
+			if (value != oldValue) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, QVTimperativePackage.GUARD_PARAMETER_BINDING__VALUE, oldValue, value));
+			}
+		}
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ConnectionVariable basicGetValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setValue(ConnectionVariable newValue) {
+		ConnectionVariable oldValue = value;
+		value = newValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.GUARD_PARAMETER_BINDING__VALUE, oldValue, value));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isIsCheck() {
+		return isCheck;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIsCheck(boolean newIsCheck) {
+		boolean oldIsCheck = isCheck;
+		isCheck = newIsCheck;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.GUARD_PARAMETER_BINDING__IS_CHECK, oldIsCheck, isCheck));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return super.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case QVTimperativePackage.GUARD_PARAMETER_BINDING__VALUE:
+				if (resolve) return getValue();
+				return basicGetValue();
+			case QVTimperativePackage.GUARD_PARAMETER_BINDING__IS_CHECK:
+				return isIsCheck();
+		}
+		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.GUARD_PARAMETER_BINDING__VALUE:
+				setValue((ConnectionVariable)newValue);
+				return;
+			case QVTimperativePackage.GUARD_PARAMETER_BINDING__IS_CHECK:
+				setIsCheck((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case QVTimperativePackage.GUARD_PARAMETER_BINDING__VALUE:
+				setValue((ConnectionVariable)null);
+				return;
+			case QVTimperativePackage.GUARD_PARAMETER_BINDING__IS_CHECK:
+				setIsCheck(IS_CHECK_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case QVTimperativePackage.GUARD_PARAMETER_BINDING__VALUE:
+				return value != null;
+			case QVTimperativePackage.GUARD_PARAMETER_BINDING__IS_CHECK:
+				return isCheck != IS_CHECK_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public <R> R accept(@NonNull Visitor<R> visitor) {
+		return (R) ((QVTimperativeVisitor<?>)visitor).visitGuardParameterBinding(this);
+	}
+
+} //GuardParameterBindingImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/LoopParameterBindingImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/LoopParameterBindingImpl.java
new file mode 100644
index 000000000..39ca96baa
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/LoopParameterBindingImpl.java
@@ -0,0 +1,244 @@
+/**
+ * <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.util.Visitor;
+import org.eclipse.qvtd.pivot.qvtimperative.LoopParameterBinding;
+import org.eclipse.qvtd.pivot.qvtimperative.LoopVariable;
+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>Loop Parameter Binding</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.LoopParameterBindingImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.LoopParameterBindingImpl#isIsCheck <em>Is Check</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class LoopParameterBindingImpl extends MappingParameterBindingImpl implements LoopParameterBinding {
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected LoopVariable value;
+
+	/**
+	 * The default value of the '{@link #isIsCheck() <em>Is Check</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIsCheck()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_CHECK_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIsCheck() <em>Is Check</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIsCheck()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean isCheck = IS_CHECK_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected LoopParameterBindingImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return QVTimperativePackage.Literals.LOOP_PARAMETER_BINDING;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public LoopVariable getValue() {
+		if (value != null && value.eIsProxy()) {
+			InternalEObject oldValue = (InternalEObject)value;
+			value = (LoopVariable)eResolveProxy(oldValue);
+			if (value != oldValue) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, QVTimperativePackage.LOOP_PARAMETER_BINDING__VALUE, oldValue, value));
+			}
+		}
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public LoopVariable basicGetValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setValue(LoopVariable newValue) {
+		LoopVariable oldValue = value;
+		value = newValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.LOOP_PARAMETER_BINDING__VALUE, oldValue, value));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isIsCheck() {
+		return isCheck;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIsCheck(boolean newIsCheck) {
+		boolean oldIsCheck = isCheck;
+		isCheck = newIsCheck;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.LOOP_PARAMETER_BINDING__IS_CHECK, oldIsCheck, isCheck));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return super.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case QVTimperativePackage.LOOP_PARAMETER_BINDING__VALUE:
+				if (resolve) return getValue();
+				return basicGetValue();
+			case QVTimperativePackage.LOOP_PARAMETER_BINDING__IS_CHECK:
+				return isIsCheck();
+		}
+		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.LOOP_PARAMETER_BINDING__VALUE:
+				setValue((LoopVariable)newValue);
+				return;
+			case QVTimperativePackage.LOOP_PARAMETER_BINDING__IS_CHECK:
+				setIsCheck((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case QVTimperativePackage.LOOP_PARAMETER_BINDING__VALUE:
+				setValue((LoopVariable)null);
+				return;
+			case QVTimperativePackage.LOOP_PARAMETER_BINDING__IS_CHECK:
+				setIsCheck(IS_CHECK_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case QVTimperativePackage.LOOP_PARAMETER_BINDING__VALUE:
+				return value != null;
+			case QVTimperativePackage.LOOP_PARAMETER_BINDING__IS_CHECK:
+				return isCheck != IS_CHECK_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public <R> R accept(@NonNull Visitor<R> visitor) {
+		return (R) ((QVTimperativeVisitor<?>)visitor).visitLoopParameterBinding(this);
+	}
+
+} //LoopParameterBindingImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MappingCallImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MappingCallImpl.java
index d7d43ddb5..25a00b8ae 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MappingCallImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MappingCallImpl.java
@@ -25,7 +25,7 @@ import org.eclipse.ocl.pivot.Element;
 import org.eclipse.ocl.pivot.util.Visitor;
 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.MappingParameterBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
 import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
 
@@ -39,6 +39,8 @@ import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
  * <ul>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingCallImpl#getBinding <em>Binding</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingCallImpl#isIsInfinite <em>Is Infinite</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingCallImpl#isIsInstall <em>Is Install</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingCallImpl#isIsInvoke <em>Is Invoke</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingCallImpl#getReferredMapping <em>Referred Mapping</em>}</li>
  * </ul>
  *
@@ -53,7 +55,7 @@ public class MappingCallImpl extends MappingStatementImpl implements MappingCall
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<MappingCallBinding> binding;
+	protected EList<MappingParameterBinding> binding;
 
 	/**
 	 * The default value of the '{@link #isIsInfinite() <em>Is Infinite</em>}' attribute.
@@ -76,6 +78,46 @@ public class MappingCallImpl extends MappingStatementImpl implements MappingCall
 	protected boolean isInfinite = IS_INFINITE_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #isIsInstall() <em>Is Install</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIsInstall()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_INSTALL_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIsInstall() <em>Is Install</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIsInstall()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean isInstall = IS_INSTALL_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isIsInvoke() <em>Is Invoke</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIsInvoke()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_INVOKE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIsInvoke() <em>Is Invoke</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIsInvoke()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean isInvoke = IS_INVOKE_EDEFAULT;
+
+	/**
 	 * The cached value of the '{@link #getReferredMapping() <em>Referred Mapping</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -160,9 +202,9 @@ public class MappingCallImpl extends MappingStatementImpl implements MappingCall
 	 * @generated
 	 */
 	@Override
-	public EList<MappingCallBinding> getBinding() {
+	public EList<MappingParameterBinding> getBinding() {
 		if (binding == null) {
-			binding = new EObjectContainmentWithInverseEList<MappingCallBinding>(MappingCallBinding.class, this, QVTimperativePackage.MAPPING_CALL__BINDING, QVTimperativePackage.MAPPING_CALL_BINDING__MAPPING_CALL);
+			binding = new EObjectContainmentWithInverseEList<MappingParameterBinding>(MappingParameterBinding.class, this, QVTimperativePackage.MAPPING_CALL__BINDING, QVTimperativePackage.MAPPING_PARAMETER_BINDING__MAPPING_CALL);
 		}
 		return binding;
 	}
@@ -195,6 +237,52 @@ public class MappingCallImpl extends MappingStatementImpl implements MappingCall
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
+	public boolean isIsInstall() {
+		return isInstall;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIsInstall(boolean newIsInstall) {
+		boolean oldIsInstall = isInstall;
+		isInstall = newIsInstall;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.MAPPING_CALL__IS_INSTALL, oldIsInstall, isInstall));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isIsInvoke() {
+		return isInvoke;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIsInvoke(boolean newIsInvoke) {
+		boolean oldIsInvoke = isInvoke;
+		isInvoke = newIsInvoke;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.MAPPING_CALL__IS_INVOKE, oldIsInvoke, isInvoke));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
@@ -231,6 +319,10 @@ public class MappingCallImpl extends MappingStatementImpl implements MappingCall
 				return getBinding();
 			case QVTimperativePackage.MAPPING_CALL__IS_INFINITE:
 				return isIsInfinite();
+			case QVTimperativePackage.MAPPING_CALL__IS_INSTALL:
+				return isIsInstall();
+			case QVTimperativePackage.MAPPING_CALL__IS_INVOKE:
+				return isIsInvoke();
 			case QVTimperativePackage.MAPPING_CALL__REFERRED_MAPPING:
 				if (resolve) return getReferredMapping();
 				return basicGetReferredMapping();
@@ -249,11 +341,17 @@ public class MappingCallImpl extends MappingStatementImpl implements MappingCall
 		switch (featureID) {
 			case QVTimperativePackage.MAPPING_CALL__BINDING:
 				getBinding().clear();
-				getBinding().addAll((Collection<? extends MappingCallBinding>)newValue);
+				getBinding().addAll((Collection<? extends MappingParameterBinding>)newValue);
 				return;
 			case QVTimperativePackage.MAPPING_CALL__IS_INFINITE:
 				setIsInfinite((Boolean)newValue);
 				return;
+			case QVTimperativePackage.MAPPING_CALL__IS_INSTALL:
+				setIsInstall((Boolean)newValue);
+				return;
+			case QVTimperativePackage.MAPPING_CALL__IS_INVOKE:
+				setIsInvoke((Boolean)newValue);
+				return;
 			case QVTimperativePackage.MAPPING_CALL__REFERRED_MAPPING:
 				setReferredMapping((Mapping)newValue);
 				return;
@@ -275,6 +373,12 @@ public class MappingCallImpl extends MappingStatementImpl implements MappingCall
 			case QVTimperativePackage.MAPPING_CALL__IS_INFINITE:
 				setIsInfinite(IS_INFINITE_EDEFAULT);
 				return;
+			case QVTimperativePackage.MAPPING_CALL__IS_INSTALL:
+				setIsInstall(IS_INSTALL_EDEFAULT);
+				return;
+			case QVTimperativePackage.MAPPING_CALL__IS_INVOKE:
+				setIsInvoke(IS_INVOKE_EDEFAULT);
+				return;
 			case QVTimperativePackage.MAPPING_CALL__REFERRED_MAPPING:
 				setReferredMapping((Mapping)null);
 				return;
@@ -294,6 +398,10 @@ public class MappingCallImpl extends MappingStatementImpl implements MappingCall
 				return binding != null && !binding.isEmpty();
 			case QVTimperativePackage.MAPPING_CALL__IS_INFINITE:
 				return isInfinite != IS_INFINITE_EDEFAULT;
+			case QVTimperativePackage.MAPPING_CALL__IS_INSTALL:
+				return isInstall != IS_INSTALL_EDEFAULT;
+			case QVTimperativePackage.MAPPING_CALL__IS_INVOKE:
+				return isInvoke != IS_INVOKE_EDEFAULT;
 			case QVTimperativePackage.MAPPING_CALL__REFERRED_MAPPING:
 				return referredMapping != null;
 		}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MappingCallBindingImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MappingParameterBindingImpl.java
index 061da4f52..9105c5a60 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MappingCallBindingImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/MappingParameterBindingImpl.java
@@ -1,13 +1,17 @@
-/*******************************************************************************
- * Copyright (c) 2013, 2016 Willink Transformations and others.
+/**
+ * <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
- *******************************************************************************/
+ *   E.D.Willink - Initial API and implementation
+ *
+ * </copyright>
+ */
 package org.eclipse.qvtd.pivot.qvtimperative.impl;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -16,32 +20,27 @@ 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.EcoreUtil;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.ocl.pivot.OCLExpression;
-import org.eclipse.ocl.pivot.VariableDeclaration;
 import org.eclipse.ocl.pivot.internal.ElementImpl;
-import org.eclipse.ocl.pivot.util.Visitor;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingCall;
-import org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding;
+import org.eclipse.qvtd.pivot.qvtimperative.MappingParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding;
 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>Mapping Call Binding</b></em>'.
+ * An implementation of the model object '<em><b>Mapping Parameter Binding</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingCallBindingImpl#getBoundVariable <em>Bound Variable</em>}</li>
- *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingCallBindingImpl#getMappingCall <em>Mapping Call</em>}</li>
- *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingCallBindingImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingParameterBindingImpl#getMappingCall <em>Mapping Call</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.MappingParameterBindingImpl#getBoundVariable <em>Bound Variable</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class MappingCallBindingImpl extends ElementImpl implements MappingCallBinding {
+public abstract class MappingParameterBindingImpl extends ElementImpl implements MappingParameterBinding {
 	/**
 	 * The cached value of the '{@link #getBoundVariable() <em>Bound Variable</em>}' reference.
 	 * <!-- begin-user-doc -->
@@ -50,24 +49,14 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	 * @generated
 	 * @ordered
 	 */
-	protected VariableDeclaration boundVariable;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected OCLExpression value;
+	protected MappingParameter boundVariable;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected MappingCallBindingImpl() {
+	protected MappingParameterBindingImpl() {
 		super();
 	}
 
@@ -78,7 +67,7 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return QVTimperativePackage.Literals.MAPPING_CALL_BINDING;
+		return QVTimperativePackage.Literals.MAPPING_PARAMETER_BINDING;
 	}
 
 	/**
@@ -88,7 +77,7 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	 */
 	@Override
 	public MappingCall getMappingCall() {
-		if (eContainerFeatureID() != QVTimperativePackage.MAPPING_CALL_BINDING__MAPPING_CALL) return null;
+		if (eContainerFeatureID() != QVTimperativePackage.MAPPING_PARAMETER_BINDING__MAPPING_CALL) return null;
 		return (MappingCall)eInternalContainer();
 	}
 
@@ -98,7 +87,7 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	 * @generated
 	 */
 	public NotificationChain basicSetMappingCall(MappingCall newMappingCall, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newMappingCall, QVTimperativePackage.MAPPING_CALL_BINDING__MAPPING_CALL, msgs);
+		msgs = eBasicSetContainer((InternalEObject)newMappingCall, QVTimperativePackage.MAPPING_PARAMETER_BINDING__MAPPING_CALL, msgs);
 		return msgs;
 	}
 
@@ -109,7 +98,7 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	 */
 	@Override
 	public void setMappingCall(MappingCall newMappingCall) {
-		if (newMappingCall != eInternalContainer() || (eContainerFeatureID() != QVTimperativePackage.MAPPING_CALL_BINDING__MAPPING_CALL && newMappingCall != null)) {
+		if (newMappingCall != eInternalContainer() || (eContainerFeatureID() != QVTimperativePackage.MAPPING_PARAMETER_BINDING__MAPPING_CALL && newMappingCall != null)) {
 			if (EcoreUtil.isAncestor(this, newMappingCall))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
@@ -121,7 +110,7 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.MAPPING_CALL_BINDING__MAPPING_CALL, newMappingCall, newMappingCall));
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.MAPPING_PARAMETER_BINDING__MAPPING_CALL, newMappingCall, newMappingCall));
 	}
 
 	/**
@@ -130,13 +119,13 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	 * @generated
 	 */
 	@Override
-	public VariableDeclaration getBoundVariable() {
+	public MappingParameter getBoundVariable() {
 		if (boundVariable != null && boundVariable.eIsProxy()) {
 			InternalEObject oldBoundVariable = (InternalEObject)boundVariable;
-			boundVariable = (VariableDeclaration)eResolveProxy(oldBoundVariable);
+			boundVariable = (MappingParameter)eResolveProxy(oldBoundVariable);
 			if (boundVariable != oldBoundVariable) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, QVTimperativePackage.MAPPING_CALL_BINDING__BOUND_VARIABLE, oldBoundVariable, boundVariable));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, QVTimperativePackage.MAPPING_PARAMETER_BINDING__BOUND_VARIABLE, oldBoundVariable, boundVariable));
 			}
 		}
 		return boundVariable;
@@ -147,7 +136,7 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public VariableDeclaration basicGetBoundVariable() {
+	public MappingParameter basicGetBoundVariable() {
 		return boundVariable;
 	}
 
@@ -157,56 +146,11 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	 * @generated
 	 */
 	@Override
-	public void setBoundVariable(VariableDeclaration newBoundVariable) {
-		VariableDeclaration oldBoundVariable = boundVariable;
+	public void setBoundVariable(MappingParameter newBoundVariable) {
+		MappingParameter oldBoundVariable = boundVariable;
 		boundVariable = newBoundVariable;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.MAPPING_CALL_BINDING__BOUND_VARIABLE, oldBoundVariable, boundVariable));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public OCLExpression getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValue(OCLExpression newValue, NotificationChain msgs) {
-		OCLExpression oldValue = value;
-		value = newValue;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, QVTimperativePackage.MAPPING_CALL_BINDING__VALUE, oldValue, newValue);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setValue(OCLExpression newValue) {
-		if (newValue != value) {
-			NotificationChain msgs = null;
-			if (value != null)
-				msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - QVTimperativePackage.MAPPING_CALL_BINDING__VALUE, null, msgs);
-			if (newValue != null)
-				msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - QVTimperativePackage.MAPPING_CALL_BINDING__VALUE, null, msgs);
-			msgs = basicSetValue(newValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.MAPPING_CALL_BINDING__VALUE, newValue, newValue));
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.MAPPING_PARAMETER_BINDING__BOUND_VARIABLE, oldBoundVariable, boundVariable));
 	}
 
 	/**
@@ -217,7 +161,7 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case QVTimperativePackage.MAPPING_CALL_BINDING__MAPPING_CALL:
+			case QVTimperativePackage.MAPPING_PARAMETER_BINDING__MAPPING_CALL:
 				if (eInternalContainer() != null)
 					msgs = eBasicRemoveFromContainer(msgs);
 				return basicSetMappingCall((MappingCall)otherEnd, msgs);
@@ -233,10 +177,8 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case QVTimperativePackage.MAPPING_CALL_BINDING__MAPPING_CALL:
+			case QVTimperativePackage.MAPPING_PARAMETER_BINDING__MAPPING_CALL:
 				return basicSetMappingCall(null, msgs);
-			case QVTimperativePackage.MAPPING_CALL_BINDING__VALUE:
-				return basicSetValue(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -249,7 +191,7 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
 		switch (eContainerFeatureID()) {
-			case QVTimperativePackage.MAPPING_CALL_BINDING__MAPPING_CALL:
+			case QVTimperativePackage.MAPPING_PARAMETER_BINDING__MAPPING_CALL:
 				return eInternalContainer().eInverseRemove(this, QVTimperativePackage.MAPPING_CALL__BINDING, MappingCall.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
@@ -263,13 +205,11 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case QVTimperativePackage.MAPPING_CALL_BINDING__BOUND_VARIABLE:
+			case QVTimperativePackage.MAPPING_PARAMETER_BINDING__MAPPING_CALL:
+				return getMappingCall();
+			case QVTimperativePackage.MAPPING_PARAMETER_BINDING__BOUND_VARIABLE:
 				if (resolve) return getBoundVariable();
 				return basicGetBoundVariable();
-			case QVTimperativePackage.MAPPING_CALL_BINDING__MAPPING_CALL:
-				return getMappingCall();
-			case QVTimperativePackage.MAPPING_CALL_BINDING__VALUE:
-				return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -282,14 +222,11 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case QVTimperativePackage.MAPPING_CALL_BINDING__BOUND_VARIABLE:
-				setBoundVariable((VariableDeclaration)newValue);
-				return;
-			case QVTimperativePackage.MAPPING_CALL_BINDING__MAPPING_CALL:
+			case QVTimperativePackage.MAPPING_PARAMETER_BINDING__MAPPING_CALL:
 				setMappingCall((MappingCall)newValue);
 				return;
-			case QVTimperativePackage.MAPPING_CALL_BINDING__VALUE:
-				setValue((OCLExpression)newValue);
+			case QVTimperativePackage.MAPPING_PARAMETER_BINDING__BOUND_VARIABLE:
+				setBoundVariable((MappingParameter)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -303,14 +240,11 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case QVTimperativePackage.MAPPING_CALL_BINDING__BOUND_VARIABLE:
-				setBoundVariable((VariableDeclaration)null);
-				return;
-			case QVTimperativePackage.MAPPING_CALL_BINDING__MAPPING_CALL:
+			case QVTimperativePackage.MAPPING_PARAMETER_BINDING__MAPPING_CALL:
 				setMappingCall((MappingCall)null);
 				return;
-			case QVTimperativePackage.MAPPING_CALL_BINDING__VALUE:
-				setValue((OCLExpression)null);
+			case QVTimperativePackage.MAPPING_PARAMETER_BINDING__BOUND_VARIABLE:
+				setBoundVariable((MappingParameter)null);
 				return;
 		}
 		super.eUnset(featureID);
@@ -324,24 +258,13 @@ public class MappingCallBindingImpl extends ElementImpl implements MappingCallBi
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case QVTimperativePackage.MAPPING_CALL_BINDING__BOUND_VARIABLE:
-				return boundVariable != null;
-			case QVTimperativePackage.MAPPING_CALL_BINDING__MAPPING_CALL:
+			case QVTimperativePackage.MAPPING_PARAMETER_BINDING__MAPPING_CALL:
 				return getMappingCall() != null;
-			case QVTimperativePackage.MAPPING_CALL_BINDING__VALUE:
-				return value != null;
+			case QVTimperativePackage.MAPPING_PARAMETER_BINDING__BOUND_VARIABLE:
+				return boundVariable != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public <R> R accept(@NonNull Visitor<R> visitor) {
-		return (R) ((QVTimperativeVisitor<?>)visitor).visitMappingCallBinding(this);
-	}
-} //MappingCallBindingImpl
+
+} //MappingParameterBindingImpl
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 4dc164ae2..df9a6f560 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
@@ -16,23 +16,27 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.qvtd.pivot.qvtimperative.*;
 import org.eclipse.qvtd.pivot.qvtimperative.AddStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.AppendParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.AppendParameterBinding;
+import org.eclipse.qvtd.pivot.qvtimperative.BufferStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.CheckStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.DeclareStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.GuardParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeTypedModel;
 import org.eclipse.qvtd.pivot.qvtimperative.LoopVariable;
 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.OutConnectionVariable;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativeFactory;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
 import org.eclipse.qvtd.pivot.qvtimperative.SetStatement;
+import org.eclipse.qvtd.pivot.qvtimperative.SimpleParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding;
 
 /**
  * <!-- begin-user-doc -->
@@ -80,19 +84,23 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 		switch (eClass.getClassifierID()) {
 			case QVTimperativePackage.ADD_STATEMENT: return createAddStatement();
 			case QVTimperativePackage.APPEND_PARAMETER: return createAppendParameter();
+			case QVTimperativePackage.APPEND_PARAMETER_BINDING: return createAppendParameterBinding();
+			case QVTimperativePackage.BUFFER_STATEMENT: return createBufferStatement();
 			case QVTimperativePackage.CHECK_STATEMENT: return createCheckStatement();
 			case QVTimperativePackage.DECLARE_STATEMENT: return createDeclareStatement();
 			case QVTimperativePackage.GUARD_PARAMETER: return createGuardParameter();
+			case QVTimperativePackage.GUARD_PARAMETER_BINDING: return createGuardParameterBinding();
 			case QVTimperativePackage.IMPERATIVE_MODEL: return createImperativeModel();
 			case QVTimperativePackage.IMPERATIVE_TYPED_MODEL: return createImperativeTypedModel();
+			case QVTimperativePackage.LOOP_PARAMETER_BINDING: return createLoopParameterBinding();
 			case QVTimperativePackage.LOOP_VARIABLE: return createLoopVariable();
 			case QVTimperativePackage.MAPPING: return createMapping();
 			case QVTimperativePackage.MAPPING_CALL: return createMappingCall();
-			case QVTimperativePackage.MAPPING_CALL_BINDING: return createMappingCallBinding();
 			case QVTimperativePackage.MAPPING_LOOP: return createMappingLoop();
 			case QVTimperativePackage.NEW_STATEMENT: return createNewStatement();
-			case QVTimperativePackage.OUT_CONNECTION_VARIABLE: return createOutConnectionVariable();
 			case QVTimperativePackage.SET_STATEMENT: return createSetStatement();
+			case QVTimperativePackage.SIMPLE_PARAMETER: return createSimpleParameter();
+			case QVTimperativePackage.SIMPLE_PARAMETER_BINDING: return createSimpleParameterBinding();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -126,6 +134,28 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
+	public @NonNull AppendParameterBinding createAppendParameterBinding() {
+		AppendParameterBindingImpl appendParameterBinding = new AppendParameterBindingImpl();
+		return appendParameterBinding;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public @NonNull BufferStatement createBufferStatement() {
+		BufferStatementImpl bufferStatement = new BufferStatementImpl();
+		return bufferStatement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public @NonNull CheckStatement createCheckStatement() {
 		CheckStatementImpl checkStatement = new CheckStatementImpl();
 		return checkStatement;
@@ -159,6 +189,17 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
+	public @NonNull GuardParameterBinding createGuardParameterBinding() {
+		GuardParameterBindingImpl guardParameterBinding = new GuardParameterBindingImpl();
+		return guardParameterBinding;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public @NonNull ImperativeModel createImperativeModel() {
 		ImperativeModelImpl imperativeModel = new ImperativeModelImpl();
 		return imperativeModel;
@@ -181,6 +222,17 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
+	public @NonNull LoopParameterBinding createLoopParameterBinding() {
+		LoopParameterBindingImpl loopParameterBinding = new LoopParameterBindingImpl();
+		return loopParameterBinding;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public @NonNull LoopVariable createLoopVariable() {
 		LoopVariableImpl loopVariable = new LoopVariableImpl();
 		return loopVariable;
@@ -214,9 +266,9 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public @NonNull MappingCallBinding createMappingCallBinding() {
-		MappingCallBindingImpl mappingCallBinding = new MappingCallBindingImpl();
-		return mappingCallBinding;
+	public @NonNull MappingLoop createMappingLoop() {
+		MappingLoopImpl mappingLoop = new MappingLoopImpl();
+		return mappingLoop;
 	}
 
 	/**
@@ -225,9 +277,9 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public @NonNull MappingLoop createMappingLoop() {
-		MappingLoopImpl mappingLoop = new MappingLoopImpl();
-		return mappingLoop;
+	public @NonNull NewStatement createNewStatement() {
+		NewStatementImpl newStatement = new NewStatementImpl();
+		return newStatement;
 	}
 
 	/**
@@ -236,9 +288,9 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public @NonNull NewStatement createNewStatement() {
-		NewStatementImpl newStatement = new NewStatementImpl();
-		return newStatement;
+	public @NonNull SetStatement createSetStatement() {
+		SetStatementImpl setStatement = new SetStatementImpl();
+		return setStatement;
 	}
 
 	/**
@@ -247,9 +299,9 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public @NonNull OutConnectionVariable createOutConnectionVariable() {
-		OutConnectionVariableImpl outConnectionVariable = new OutConnectionVariableImpl();
-		return outConnectionVariable;
+	public @NonNull SimpleParameter createSimpleParameter() {
+		SimpleParameterImpl simpleParameter = new SimpleParameterImpl();
+		return simpleParameter;
 	}
 
 	/**
@@ -258,9 +310,9 @@ public class QVTimperativeFactoryImpl extends EFactoryImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public @NonNull SetStatement createSetStatement() {
-		SetStatementImpl setStatement = new SetStatementImpl();
-		return setStatement;
+	public @NonNull SimpleParameterBinding createSimpleParameterBinding() {
+		SimpleParameterBindingImpl simpleParameterBinding = new SimpleParameterBindingImpl();
+		return simpleParameterBinding;
 	}
 
 	/**
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 3d2091563..7da584672 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
@@ -19,25 +19,30 @@ import org.eclipse.ocl.pivot.PivotPackage;
 import org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage;
 import org.eclipse.qvtd.pivot.qvtimperative.AddStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.AppendParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.AppendParameterBinding;
+import org.eclipse.qvtd.pivot.qvtimperative.BufferStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.CheckStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionVariable;
 import org.eclipse.qvtd.pivot.qvtimperative.DeclareStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.GuardParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeTypedModel;
+import org.eclipse.qvtd.pivot.qvtimperative.LoopParameterBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.LoopVariable;
 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.MappingParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.NewStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.ObservableStatement;
-import org.eclipse.qvtd.pivot.qvtimperative.OutConnectionVariable;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativeFactory;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
 import org.eclipse.qvtd.pivot.qvtimperative.SetStatement;
+import org.eclipse.qvtd.pivot.qvtimperative.SimpleParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.Statement;
 import org.eclipse.qvtd.pivot.qvtimperative.VariableStatement;
 
@@ -67,6 +72,20 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass appendParameterBindingEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass bufferStatementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass checkStatementEClass = null;
 
 	/**
@@ -95,6 +114,13 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass guardParameterBindingEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass imperativeModelEClass = null;
 
 	/**
@@ -109,6 +135,13 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass loopParameterBindingEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass loopVariableEClass = null;
 
 	/**
@@ -130,21 +163,21 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass mappingCallBindingEClass = null;
+	private EClass mappingLoopEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass mappingLoopEClass = null;
+	private EClass mappingParameterEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass mappingParameterEClass = null;
+	private EClass mappingParameterBindingEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -172,14 +205,21 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass outConnectionVariableEClass = null;
+	private EClass setStatementEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass setStatementEClass = null;
+	private EClass simpleParameterEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass simpleParameterBindingEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -316,6 +356,46 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
+	public EClass getAppendParameterBinding() {
+		return appendParameterBindingEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getAppendParameterBinding_Value() {
+		return (EReference)appendParameterBindingEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getBufferStatement() {
+		return bufferStatementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getBufferStatement_OwnedExpression() {
+		return (EReference)bufferStatementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EClass getCheckStatement() {
 		return checkStatementEClass;
 	}
@@ -356,7 +436,7 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EAttribute getDeclareStatement_IsChecked() {
+	public EAttribute getDeclareStatement_IsCheck() {
 		return (EAttribute)declareStatementEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -396,6 +476,36 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
+	public EClass getGuardParameterBinding() {
+		return guardParameterBindingEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getGuardParameterBinding_Value() {
+		return (EReference)guardParameterBindingEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getGuardParameterBinding_IsCheck() {
+		return (EAttribute)guardParameterBindingEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EClass getImperativeModel() {
 		return imperativeModelEClass;
 	}
@@ -436,6 +546,36 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
+	public EClass getLoopParameterBinding() {
+		return loopParameterBindingEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getLoopParameterBinding_Value() {
+		return (EReference)loopParameterBindingEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getLoopParameterBinding_IsCheck() {
+		return (EAttribute)loopParameterBindingEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EClass getLoopVariable() {
 		return loopVariableEClass;
 	}
@@ -497,7 +637,7 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 */
 	@Override
 	public EReference getMappingCall_ReferredMapping() {
-		return (EReference)mappingCallEClass.getEStructuralFeatures().get(2);
+		return (EReference)mappingCallEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -526,8 +666,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EClass getMappingCallBinding() {
-		return mappingCallBindingEClass;
+	public EAttribute getMappingCall_IsInstall() {
+		return (EAttribute)mappingCallEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -536,8 +676,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EReference getMappingCallBinding_MappingCall() {
-		return (EReference)mappingCallBindingEClass.getEStructuralFeatures().get(1);
+	public EAttribute getMappingCall_IsInvoke() {
+		return (EAttribute)mappingCallEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -546,8 +686,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EReference getMappingCallBinding_BoundVariable() {
-		return (EReference)mappingCallBindingEClass.getEStructuralFeatures().get(0);
+	public EClass getMappingLoop() {
+		return mappingLoopEClass;
 	}
 
 	/**
@@ -556,8 +696,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EReference getMappingCallBinding_Value() {
-		return (EReference)mappingCallBindingEClass.getEStructuralFeatures().get(2);
+	public EReference getMappingLoop_OwnedIterators() {
+		return (EReference)mappingLoopEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -566,8 +706,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EClass getMappingLoop() {
-		return mappingLoopEClass;
+	public EReference getMappingLoop_OwnedMappingStatements() {
+		return (EReference)mappingLoopEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -576,8 +716,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EReference getMappingLoop_OwnedIterators() {
-		return (EReference)mappingLoopEClass.getEStructuralFeatures().get(0);
+	public EReference getMappingLoop_OwnedExpression() {
+		return (EReference)mappingLoopEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -586,8 +726,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EReference getMappingLoop_OwnedMappingStatements() {
-		return (EReference)mappingLoopEClass.getEStructuralFeatures().get(1);
+	public EClass getMappingParameter() {
+		return mappingParameterEClass;
 	}
 
 	/**
@@ -596,8 +736,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EReference getMappingLoop_OwnedExpression() {
-		return (EReference)mappingLoopEClass.getEStructuralFeatures().get(2);
+	public EClass getMappingParameterBinding() {
+		return mappingParameterBindingEClass;
 	}
 
 	/**
@@ -606,8 +746,18 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EClass getMappingParameter() {
-		return mappingParameterEClass;
+	public EReference getMappingParameterBinding_MappingCall() {
+		return (EReference)mappingParameterBindingEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getMappingParameterBinding_BoundVariable() {
+		return (EReference)mappingParameterBindingEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -676,8 +826,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EClass getOutConnectionVariable() {
-		return outConnectionVariableEClass;
+	public EClass getSetStatement() {
+		return setStatementEClass;
 	}
 
 	/**
@@ -686,8 +836,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EReference getOutConnectionVariable_OwnedExpression() {
-		return (EReference)outConnectionVariableEClass.getEStructuralFeatures().get(0);
+	public EReference getSetStatement_TargetVariable() {
+		return (EReference)setStatementEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -696,8 +846,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EClass getSetStatement() {
-		return setStatementEClass;
+	public EReference getSetStatement_TargetProperty() {
+		return (EReference)setStatementEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -706,8 +856,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EReference getSetStatement_TargetVariable() {
-		return (EReference)setStatementEClass.getEStructuralFeatures().get(0);
+	public EAttribute getSetStatement_IsOpposite() {
+		return (EAttribute)setStatementEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -716,8 +866,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EReference getSetStatement_TargetProperty() {
-		return (EReference)setStatementEClass.getEStructuralFeatures().get(1);
+	public EAttribute getSetStatement_IsNotify() {
+		return (EAttribute)setStatementEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -726,8 +876,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EAttribute getSetStatement_IsOpposite() {
-		return (EAttribute)setStatementEClass.getEStructuralFeatures().get(2);
+	public EReference getSetStatement_OwnedExpression() {
+		return (EReference)setStatementEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -736,8 +886,8 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EAttribute getSetStatement_IsNotify() {
-		return (EAttribute)setStatementEClass.getEStructuralFeatures().get(3);
+	public EClass getSimpleParameter() {
+		return simpleParameterEClass;
 	}
 
 	/**
@@ -746,8 +896,38 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	 * @generated
 	 */
 	@Override
-	public EReference getSetStatement_OwnedExpression() {
-		return (EReference)setStatementEClass.getEStructuralFeatures().get(4);
+	public EReference getSimpleParameter_ReferredTypedModel() {
+		return (EReference)simpleParameterEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getSimpleParameterBinding() {
+		return simpleParameterBindingEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getSimpleParameterBinding_Value() {
+		return (EReference)simpleParameterBindingEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getSimpleParameterBinding_IsCheck() {
+		return (EAttribute)simpleParameterBindingEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -806,24 +986,38 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 
 		appendParameterEClass = createEClass(APPEND_PARAMETER);
 
+		appendParameterBindingEClass = createEClass(APPEND_PARAMETER_BINDING);
+		createEReference(appendParameterBindingEClass, APPEND_PARAMETER_BINDING__VALUE);
+
+		bufferStatementEClass = createEClass(BUFFER_STATEMENT);
+		createEReference(bufferStatementEClass, BUFFER_STATEMENT__OWNED_EXPRESSION);
+
 		checkStatementEClass = createEClass(CHECK_STATEMENT);
 		createEReference(checkStatementEClass, CHECK_STATEMENT__OWNED_EXPRESSION);
 
 		connectionVariableEClass = createEClass(CONNECTION_VARIABLE);
 
 		declareStatementEClass = createEClass(DECLARE_STATEMENT);
-		createEAttribute(declareStatementEClass, DECLARE_STATEMENT__IS_CHECKED);
+		createEAttribute(declareStatementEClass, DECLARE_STATEMENT__IS_CHECK);
 		createEReference(declareStatementEClass, DECLARE_STATEMENT__OWNED_EXPRESSION);
 
 		guardParameterEClass = createEClass(GUARD_PARAMETER);
 		createEReference(guardParameterEClass, GUARD_PARAMETER__REFERRED_TYPED_MODEL);
 
+		guardParameterBindingEClass = createEClass(GUARD_PARAMETER_BINDING);
+		createEReference(guardParameterBindingEClass, GUARD_PARAMETER_BINDING__VALUE);
+		createEAttribute(guardParameterBindingEClass, GUARD_PARAMETER_BINDING__IS_CHECK);
+
 		imperativeModelEClass = createEClass(IMPERATIVE_MODEL);
 
 		imperativeTypedModelEClass = createEClass(IMPERATIVE_TYPED_MODEL);
 		createEAttribute(imperativeTypedModelEClass, IMPERATIVE_TYPED_MODEL__IS_CHECKED);
 		createEAttribute(imperativeTypedModelEClass, IMPERATIVE_TYPED_MODEL__IS_ENFORCED);
 
+		loopParameterBindingEClass = createEClass(LOOP_PARAMETER_BINDING);
+		createEReference(loopParameterBindingEClass, LOOP_PARAMETER_BINDING__VALUE);
+		createEAttribute(loopParameterBindingEClass, LOOP_PARAMETER_BINDING__IS_CHECK);
+
 		loopVariableEClass = createEClass(LOOP_VARIABLE);
 		createEReference(loopVariableEClass, LOOP_VARIABLE__OWNING_MAPPING_LOOP);
 
@@ -834,13 +1028,10 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 		mappingCallEClass = createEClass(MAPPING_CALL);
 		createEReference(mappingCallEClass, MAPPING_CALL__BINDING);
 		createEAttribute(mappingCallEClass, MAPPING_CALL__IS_INFINITE);
+		createEAttribute(mappingCallEClass, MAPPING_CALL__IS_INSTALL);
+		createEAttribute(mappingCallEClass, MAPPING_CALL__IS_INVOKE);
 		createEReference(mappingCallEClass, MAPPING_CALL__REFERRED_MAPPING);
 
-		mappingCallBindingEClass = createEClass(MAPPING_CALL_BINDING);
-		createEReference(mappingCallBindingEClass, MAPPING_CALL_BINDING__BOUND_VARIABLE);
-		createEReference(mappingCallBindingEClass, MAPPING_CALL_BINDING__MAPPING_CALL);
-		createEReference(mappingCallBindingEClass, MAPPING_CALL_BINDING__VALUE);
-
 		mappingLoopEClass = createEClass(MAPPING_LOOP);
 		createEReference(mappingLoopEClass, MAPPING_LOOP__OWNED_ITERATORS);
 		createEReference(mappingLoopEClass, MAPPING_LOOP__OWNED_MAPPING_STATEMENTS);
@@ -848,6 +1039,10 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 
 		mappingParameterEClass = createEClass(MAPPING_PARAMETER);
 
+		mappingParameterBindingEClass = createEClass(MAPPING_PARAMETER_BINDING);
+		createEReference(mappingParameterBindingEClass, MAPPING_PARAMETER_BINDING__MAPPING_CALL);
+		createEReference(mappingParameterBindingEClass, MAPPING_PARAMETER_BINDING__BOUND_VARIABLE);
+
 		mappingStatementEClass = createEClass(MAPPING_STATEMENT);
 
 		newStatementEClass = createEClass(NEW_STATEMENT);
@@ -857,9 +1052,6 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 		observableStatementEClass = createEClass(OBSERVABLE_STATEMENT);
 		createEReference(observableStatementEClass, OBSERVABLE_STATEMENT__OBSERVED_PROPERTIES);
 
-		outConnectionVariableEClass = createEClass(OUT_CONNECTION_VARIABLE);
-		createEReference(outConnectionVariableEClass, OUT_CONNECTION_VARIABLE__OWNED_EXPRESSION);
-
 		setStatementEClass = createEClass(SET_STATEMENT);
 		createEReference(setStatementEClass, SET_STATEMENT__TARGET_VARIABLE);
 		createEReference(setStatementEClass, SET_STATEMENT__TARGET_PROPERTY);
@@ -867,6 +1059,13 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 		createEAttribute(setStatementEClass, SET_STATEMENT__IS_NOTIFY);
 		createEReference(setStatementEClass, SET_STATEMENT__OWNED_EXPRESSION);
 
+		simpleParameterEClass = createEClass(SIMPLE_PARAMETER);
+		createEReference(simpleParameterEClass, SIMPLE_PARAMETER__REFERRED_TYPED_MODEL);
+
+		simpleParameterBindingEClass = createEClass(SIMPLE_PARAMETER_BINDING);
+		createEReference(simpleParameterBindingEClass, SIMPLE_PARAMETER_BINDING__VALUE);
+		createEAttribute(simpleParameterBindingEClass, SIMPLE_PARAMETER_BINDING__IS_CHECK);
+
 		statementEClass = createEClass(STATEMENT);
 
 		variableStatementEClass = createEClass(VARIABLE_STATEMENT);
@@ -908,29 +1107,34 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 		addStatementEClass.getESuperTypes().add(this.getObservableStatement());
 		appendParameterEClass.getESuperTypes().add(this.getConnectionVariable());
 		appendParameterEClass.getESuperTypes().add(this.getMappingParameter());
+		appendParameterBindingEClass.getESuperTypes().add(this.getMappingParameterBinding());
+		bufferStatementEClass.getESuperTypes().add(this.getConnectionVariable());
+		bufferStatementEClass.getESuperTypes().add(this.getVariableStatement());
+		bufferStatementEClass.getESuperTypes().add(this.getObservableStatement());
 		checkStatementEClass.getESuperTypes().add(this.getObservableStatement());
 		connectionVariableEClass.getESuperTypes().add(thePivotPackage.getVariableDeclaration());
 		declareStatementEClass.getESuperTypes().add(this.getVariableStatement());
 		declareStatementEClass.getESuperTypes().add(this.getObservableStatement());
 		guardParameterEClass.getESuperTypes().add(this.getMappingParameter());
+		guardParameterBindingEClass.getESuperTypes().add(this.getMappingParameterBinding());
 		imperativeModelEClass.getESuperTypes().add(theQVTbasePackage.getBaseModel());
 		imperativeTypedModelEClass.getESuperTypes().add(theQVTbasePackage.getTypedModel());
+		loopParameterBindingEClass.getESuperTypes().add(this.getMappingParameterBinding());
 		loopVariableEClass.getESuperTypes().add(thePivotPackage.getVariableDeclaration());
 		mappingEClass.getESuperTypes().add(theQVTbasePackage.getRule());
 		mappingCallEClass.getESuperTypes().add(this.getMappingStatement());
 		mappingCallEClass.getESuperTypes().add(thePivotPackage.getReferringElement());
-		mappingCallBindingEClass.getESuperTypes().add(thePivotPackage.getElement());
 		mappingLoopEClass.getESuperTypes().add(this.getMappingStatement());
 		mappingLoopEClass.getESuperTypes().add(this.getObservableStatement());
 		mappingParameterEClass.getESuperTypes().add(thePivotPackage.getVariableDeclaration());
+		mappingParameterBindingEClass.getESuperTypes().add(thePivotPackage.getElement());
 		mappingStatementEClass.getESuperTypes().add(this.getStatement());
 		newStatementEClass.getESuperTypes().add(this.getVariableStatement());
 		newStatementEClass.getESuperTypes().add(this.getObservableStatement());
 		observableStatementEClass.getESuperTypes().add(this.getStatement());
-		outConnectionVariableEClass.getESuperTypes().add(this.getConnectionVariable());
-		outConnectionVariableEClass.getESuperTypes().add(this.getVariableStatement());
-		outConnectionVariableEClass.getESuperTypes().add(this.getObservableStatement());
 		setStatementEClass.getESuperTypes().add(this.getObservableStatement());
+		simpleParameterEClass.getESuperTypes().add(this.getMappingParameter());
+		simpleParameterBindingEClass.getESuperTypes().add(this.getMappingParameterBinding());
 		statementEClass.getESuperTypes().add(thePivotPackage.getNamedElement());
 		variableStatementEClass.getESuperTypes().add(thePivotPackage.getVariableDeclaration());
 		variableStatementEClass.getESuperTypes().add(this.getStatement());
@@ -943,24 +1147,38 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 
 		initEClass(appendParameterEClass, AppendParameter.class, "AppendParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
+		initEClass(appendParameterBindingEClass, AppendParameterBinding.class, "AppendParameterBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getAppendParameterBinding_Value(), this.getConnectionVariable(), null, "value", null, 1, 1, AppendParameterBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(bufferStatementEClass, BufferStatement.class, "BufferStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getBufferStatement_OwnedExpression(), thePivotPackage.getOCLExpression(), null, "ownedExpression", null, 0, 1, BufferStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		initEClass(checkStatementEClass, CheckStatement.class, "CheckStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getCheckStatement_OwnedExpression(), thePivotPackage.getOCLExpression(), null, "ownedExpression", null, 1, 1, CheckStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(connectionVariableEClass, ConnectionVariable.class, "ConnectionVariable", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(declareStatementEClass, DeclareStatement.class, "DeclareStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDeclareStatement_IsChecked(), ecorePackage.getEBoolean(), "isChecked", "false", 0, 1, DeclareStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDeclareStatement_IsCheck(), ecorePackage.getEBoolean(), "isCheck", "false", 0, 1, DeclareStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getDeclareStatement_OwnedExpression(), thePivotPackage.getOCLExpression(), null, "ownedExpression", null, 1, 1, DeclareStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(guardParameterEClass, GuardParameter.class, "GuardParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getGuardParameter_ReferredTypedModel(), this.getImperativeTypedModel(), null, "referredTypedModel", null, 1, 1, GuardParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(guardParameterBindingEClass, GuardParameterBinding.class, "GuardParameterBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getGuardParameterBinding_Value(), this.getConnectionVariable(), null, "value", null, 1, 1, GuardParameterBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getGuardParameterBinding_IsCheck(), ecorePackage.getEBoolean(), "isCheck", "false", 0, 1, GuardParameterBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		initEClass(imperativeModelEClass, ImperativeModel.class, "ImperativeModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(imperativeTypedModelEClass, ImperativeTypedModel.class, "ImperativeTypedModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getImperativeTypedModel_IsChecked(), ecorePackage.getEBoolean(), "isChecked", "false", 0, 1, ImperativeTypedModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getImperativeTypedModel_IsEnforced(), ecorePackage.getEBoolean(), "isEnforced", "false", 0, 1, ImperativeTypedModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(loopParameterBindingEClass, LoopParameterBinding.class, "LoopParameterBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getLoopParameterBinding_Value(), this.getLoopVariable(), null, "value", null, 1, 1, LoopParameterBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getLoopParameterBinding_IsCheck(), ecorePackage.getEBoolean(), "isCheck", "false", 0, 1, LoopParameterBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		initEClass(loopVariableEClass, LoopVariable.class, "LoopVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getLoopVariable_OwningMappingLoop(), this.getMappingLoop(), this.getMappingLoop_OwnedIterators(), "owningMappingLoop", null, 1, 1, LoopVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -969,15 +1187,12 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 		initEReference(getMapping_OwnedStatements(), this.getStatement(), null, "ownedStatements", null, 0, -1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(mappingCallEClass, MappingCall.class, "MappingCall", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMappingCall_Binding(), this.getMappingCallBinding(), this.getMappingCallBinding_MappingCall(), "binding", null, 0, -1, MappingCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getMappingCall_Binding(), this.getMappingParameterBinding(), this.getMappingParameterBinding_MappingCall(), "binding", null, 0, -1, MappingCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMappingCall_IsInfinite(), thePivotPackage.getBoolean(), "isInfinite", "false", 0, 1, MappingCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMappingCall_IsInstall(), thePivotPackage.getBoolean(), "isInstall", "false", 0, 1, MappingCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMappingCall_IsInvoke(), thePivotPackage.getBoolean(), "isInvoke", "false", 0, 1, MappingCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getMappingCall_ReferredMapping(), this.getMapping(), null, "referredMapping", null, 1, 1, MappingCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(mappingCallBindingEClass, MappingCallBinding.class, "MappingCallBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMappingCallBinding_BoundVariable(), thePivotPackage.getVariableDeclaration(), null, "boundVariable", null, 1, 1, MappingCallBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMappingCallBinding_MappingCall(), this.getMappingCall(), this.getMappingCall_Binding(), "mappingCall", null, 0, 1, MappingCallBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMappingCallBinding_Value(), thePivotPackage.getOCLExpression(), null, "value", null, 1, 1, MappingCallBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		initEClass(mappingLoopEClass, MappingLoop.class, "MappingLoop", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getMappingLoop_OwnedIterators(), this.getLoopVariable(), this.getLoopVariable_OwningMappingLoop(), "ownedIterators", null, 0, -1, MappingLoop.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getMappingLoop_OwnedMappingStatements(), this.getMappingStatement(), null, "ownedMappingStatements", null, 0, -1, MappingLoop.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -985,6 +1200,10 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 
 		initEClass(mappingParameterEClass, MappingParameter.class, "MappingParameter", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
+		initEClass(mappingParameterBindingEClass, MappingParameterBinding.class, "MappingParameterBinding", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getMappingParameterBinding_MappingCall(), this.getMappingCall(), this.getMappingCall_Binding(), "mappingCall", null, 0, 1, MappingParameterBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getMappingParameterBinding_BoundVariable(), this.getMappingParameter(), null, "boundVariable", null, 1, 1, MappingParameterBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		initEClass(mappingStatementEClass, MappingStatement.class, "MappingStatement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(newStatementEClass, NewStatement.class, "NewStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -994,9 +1213,6 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 		initEClass(observableStatementEClass, ObservableStatement.class, "ObservableStatement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getObservableStatement_ObservedProperties(), thePivotPackage.getProperty(), null, "observedProperties", null, 0, -1, ObservableStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
-		initEClass(outConnectionVariableEClass, OutConnectionVariable.class, "OutConnectionVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getOutConnectionVariable_OwnedExpression(), thePivotPackage.getOCLExpression(), null, "ownedExpression", null, 0, 1, OutConnectionVariable.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_TargetVariable(), thePivotPackage.getVariableDeclaration(), null, "targetVariable", null, 1, 1, SetStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getSetStatement_TargetProperty(), thePivotPackage.getProperty(), null, "targetProperty", null, 1, 1, SetStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1004,6 +1220,13 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 		initEAttribute(getSetStatement_IsNotify(), ecorePackage.getEBoolean(), "isNotify", null, 0, 1, SetStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getSetStatement_OwnedExpression(), thePivotPackage.getOCLExpression(), null, "ownedExpression", null, 1, 1, SetStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(simpleParameterEClass, SimpleParameter.class, "SimpleParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getSimpleParameter_ReferredTypedModel(), this.getImperativeTypedModel(), null, "referredTypedModel", null, 1, 1, SimpleParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(simpleParameterBindingEClass, SimpleParameterBinding.class, "SimpleParameterBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getSimpleParameterBinding_Value(), thePivotPackage.getOCLExpression(), null, "value", null, 1, 1, SimpleParameterBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getSimpleParameterBinding_IsCheck(), ecorePackage.getEBoolean(), "isCheck", "false", 0, 1, SimpleParameterBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		initEClass(statementEClass, Statement.class, "Statement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(variableStatementEClass, VariableStatement.class, "VariableStatement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/SimpleParameterBindingImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/SimpleParameterBindingImpl.java
new file mode 100644
index 000000000..2076b4b7f
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/SimpleParameterBindingImpl.java
@@ -0,0 +1,263 @@
+/**
+ * <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.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.QVTimperativePackage;
+import org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding;
+import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Simple Parameter Binding</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.SimpleParameterBindingImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.SimpleParameterBindingImpl#isIsCheck <em>Is Check</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class SimpleParameterBindingImpl extends MappingParameterBindingImpl implements SimpleParameterBinding {
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected OCLExpression value;
+
+	/**
+	 * The default value of the '{@link #isIsCheck() <em>Is Check</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIsCheck()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_CHECK_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIsCheck() <em>Is Check</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIsCheck()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean isCheck = IS_CHECK_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected SimpleParameterBindingImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return QVTimperativePackage.Literals.SIMPLE_PARAMETER_BINDING;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public OCLExpression getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetValue(OCLExpression newValue, NotificationChain msgs) {
+		OCLExpression oldValue = value;
+		value = newValue;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, QVTimperativePackage.SIMPLE_PARAMETER_BINDING__VALUE, oldValue, newValue);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setValue(OCLExpression newValue) {
+		if (newValue != value) {
+			NotificationChain msgs = null;
+			if (value != null)
+				msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - QVTimperativePackage.SIMPLE_PARAMETER_BINDING__VALUE, null, msgs);
+			if (newValue != null)
+				msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - QVTimperativePackage.SIMPLE_PARAMETER_BINDING__VALUE, null, msgs);
+			msgs = basicSetValue(newValue, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.SIMPLE_PARAMETER_BINDING__VALUE, newValue, newValue));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isIsCheck() {
+		return isCheck;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setIsCheck(boolean newIsCheck) {
+		boolean oldIsCheck = isCheck;
+		isCheck = newIsCheck;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.SIMPLE_PARAMETER_BINDING__IS_CHECK, oldIsCheck, isCheck));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return super.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case QVTimperativePackage.SIMPLE_PARAMETER_BINDING__VALUE:
+				return basicSetValue(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 QVTimperativePackage.SIMPLE_PARAMETER_BINDING__VALUE:
+				return getValue();
+			case QVTimperativePackage.SIMPLE_PARAMETER_BINDING__IS_CHECK:
+				return isIsCheck();
+		}
+		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.SIMPLE_PARAMETER_BINDING__VALUE:
+				setValue((OCLExpression)newValue);
+				return;
+			case QVTimperativePackage.SIMPLE_PARAMETER_BINDING__IS_CHECK:
+				setIsCheck((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case QVTimperativePackage.SIMPLE_PARAMETER_BINDING__VALUE:
+				setValue((OCLExpression)null);
+				return;
+			case QVTimperativePackage.SIMPLE_PARAMETER_BINDING__IS_CHECK:
+				setIsCheck(IS_CHECK_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case QVTimperativePackage.SIMPLE_PARAMETER_BINDING__VALUE:
+				return value != null;
+			case QVTimperativePackage.SIMPLE_PARAMETER_BINDING__IS_CHECK:
+				return isCheck != IS_CHECK_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public <R> R accept(@NonNull Visitor<R> visitor) {
+		return (R) ((QVTimperativeVisitor<?>)visitor).visitSimpleParameterBinding(this);
+	}
+
+} //SimpleParameterBindingImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/SimpleParameterImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/SimpleParameterImpl.java
new file mode 100644
index 000000000..1ffd1d990
--- /dev/null
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/SimpleParameterImpl.java
@@ -0,0 +1,180 @@
+/**
+ * <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.util.Visitor;
+import org.eclipse.qvtd.pivot.qvtimperative.ImperativeTypedModel;
+import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
+import org.eclipse.qvtd.pivot.qvtimperative.SimpleParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.util.QVTimperativeVisitor;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Simple Parameter</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtimperative.impl.SimpleParameterImpl#getReferredTypedModel <em>Referred Typed Model</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class SimpleParameterImpl extends MappingParameterImpl implements SimpleParameter {
+	/**
+	 * The cached value of the '{@link #getReferredTypedModel() <em>Referred Typed Model</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getReferredTypedModel()
+	 * @generated
+	 * @ordered
+	 */
+	protected ImperativeTypedModel referredTypedModel;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected SimpleParameterImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return QVTimperativePackage.Literals.SIMPLE_PARAMETER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ImperativeTypedModel getReferredTypedModel() {
+		if (referredTypedModel != null && referredTypedModel.eIsProxy()) {
+			InternalEObject oldReferredTypedModel = (InternalEObject)referredTypedModel;
+			referredTypedModel = (ImperativeTypedModel)eResolveProxy(oldReferredTypedModel);
+			if (referredTypedModel != oldReferredTypedModel) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, QVTimperativePackage.SIMPLE_PARAMETER__REFERRED_TYPED_MODEL, oldReferredTypedModel, referredTypedModel));
+			}
+		}
+		return referredTypedModel;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ImperativeTypedModel basicGetReferredTypedModel() {
+		return referredTypedModel;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setReferredTypedModel(ImperativeTypedModel newReferredTypedModel) {
+		ImperativeTypedModel oldReferredTypedModel = referredTypedModel;
+		referredTypedModel = newReferredTypedModel;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, QVTimperativePackage.SIMPLE_PARAMETER__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.SIMPLE_PARAMETER__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.SIMPLE_PARAMETER__REFERRED_TYPED_MODEL:
+				setReferredTypedModel((ImperativeTypedModel)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case QVTimperativePackage.SIMPLE_PARAMETER__REFERRED_TYPED_MODEL:
+				setReferredTypedModel((ImperativeTypedModel)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case QVTimperativePackage.SIMPLE_PARAMETER__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).visitSimpleParameter(this);
+	}
+
+} //SimpleParameterImpl
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 ee1b00e77..7c3c818b4 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
@@ -46,6 +46,16 @@ public abstract class AbstractDelegatingQVTimperativeVisitor<R, C, @NonNull D ex
 	}
 
 	@Override
+	public R visitAppendParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull AppendParameterBinding object) {
+		return delegate.visitAppendParameterBinding(object);
+	}
+
+	@Override
+	public R visitBufferStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BufferStatement object) {
+		return delegate.visitBufferStatement(object);
+	}
+
+	@Override
 	public R visitCheckStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CheckStatement object) {
 		return delegate.visitCheckStatement(object);
 	}
@@ -66,6 +76,11 @@ public abstract class AbstractDelegatingQVTimperativeVisitor<R, C, @NonNull D ex
 	}
 
 	@Override
+	public R visitGuardParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardParameterBinding object) {
+		return delegate.visitGuardParameterBinding(object);
+	}
+
+	@Override
 	public R visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
 		return delegate.visitImperativeModel(object);
 	}
@@ -76,6 +91,11 @@ public abstract class AbstractDelegatingQVTimperativeVisitor<R, C, @NonNull D ex
 	}
 
 	@Override
+	public R visitLoopParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopParameterBinding object) {
+		return delegate.visitLoopParameterBinding(object);
+	}
+
+	@Override
 	public R visitLoopVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopVariable object) {
 		return delegate.visitLoopVariable(object);
 	}
@@ -91,11 +111,6 @@ public abstract class AbstractDelegatingQVTimperativeVisitor<R, C, @NonNull D ex
 	}
 
 	@Override
-	public R visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object) {
-		return delegate.visitMappingCallBinding(object);
-	}
-
-	@Override
 	public R visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object) {
 		return delegate.visitMappingLoop(object);
 	}
@@ -106,6 +121,11 @@ public abstract class AbstractDelegatingQVTimperativeVisitor<R, C, @NonNull D ex
 	}
 
 	@Override
+	public R visitMappingParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameterBinding object) {
+		return delegate.visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public R visitMappingStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingStatement object) {
 		return delegate.visitMappingStatement(object);
 	}
@@ -121,13 +141,18 @@ public abstract class AbstractDelegatingQVTimperativeVisitor<R, C, @NonNull D ex
 	}
 
 	@Override
-	public R visitOutConnectionVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull OutConnectionVariable object) {
-		return delegate.visitOutConnectionVariable(object);
+	public R visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
+		return delegate.visitSetStatement(object);
+	}
+
+	@Override
+	public R visitSimpleParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameter object) {
+		return delegate.visitSimpleParameter(object);
 	}
 
 	@Override
-	public R visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
-		return delegate.visitSetStatement(object);
+	public R visitSimpleParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameterBinding object) {
+		return delegate.visitSimpleParameterBinding(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 fd33e29cb..26e1f2ca2 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
@@ -50,6 +50,16 @@ public abstract class AbstractExtendingQVTimperativeVisitor<R, C>
 	}
 
 	@Override
+	public R visitAppendParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull AppendParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
+	public R visitBufferStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BufferStatement object) {
+		return visitConnectionVariable(object);
+	}
+
+	@Override
 	public R visitCheckStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CheckStatement object) {
 		return visitObservableStatement(object);
 	}
@@ -70,6 +80,11 @@ public abstract class AbstractExtendingQVTimperativeVisitor<R, C>
 	}
 
 	@Override
+	public R visitGuardParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public R visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
 		return visitBaseModel(object);
 	}
@@ -80,6 +95,11 @@ public abstract class AbstractExtendingQVTimperativeVisitor<R, C>
 	}
 
 	@Override
+	public R visitLoopParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public R visitLoopVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopVariable object) {
 		return visitVariableDeclaration(object);
 	}
@@ -95,11 +115,6 @@ public abstract class AbstractExtendingQVTimperativeVisitor<R, C>
 	}
 
 	@Override
-	public R visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object) {
-		return visitElement(object);
-	}
-
-	@Override
 	public R visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object) {
 		return visitMappingStatement(object);
 	}
@@ -110,6 +125,11 @@ public abstract class AbstractExtendingQVTimperativeVisitor<R, C>
 	}
 
 	@Override
+	public R visitMappingParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameterBinding object) {
+		return visitElement(object);
+	}
+
+	@Override
 	public R visitMappingStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingStatement object) {
 		return visitStatement(object);
 	}
@@ -125,13 +145,18 @@ public abstract class AbstractExtendingQVTimperativeVisitor<R, C>
 	}
 
 	@Override
-	public R visitOutConnectionVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull OutConnectionVariable object) {
-		return visitConnectionVariable(object);
+	public R visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
+		return visitObservableStatement(object);
 	}
 
 	@Override
-	public R visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
-		return visitObservableStatement(object);
+	public R visitSimpleParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameter object) {
+		return visitMappingParameter(object);
+	}
+
+	@Override
+	public R visitSimpleParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameterBinding object) {
+		return visitMappingParameterBinding(object);
 	}
 
 	@Override
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 633f62546..7b604982a 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
@@ -44,6 +44,16 @@ public abstract class AbstractMergedQVTimperativeVisitor<R, C>
 	}
 
 	@Override
+	public R visitAppendParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull AppendParameterBinding object) {
+		return visiting(object);
+	}
+
+	@Override
+	public R visitBufferStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BufferStatement object) {
+		return visiting(object);
+	}
+
+	@Override
 	public R visitCheckStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CheckStatement object) {
 		return visiting(object);
 	}
@@ -64,6 +74,11 @@ public abstract class AbstractMergedQVTimperativeVisitor<R, C>
 	}
 
 	@Override
+	public R visitGuardParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardParameterBinding object) {
+		return visiting(object);
+	}
+
+	@Override
 	public R visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
 		return visiting(object);
 	}
@@ -74,6 +89,11 @@ public abstract class AbstractMergedQVTimperativeVisitor<R, C>
 	}
 
 	@Override
+	public R visitLoopParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopParameterBinding object) {
+		return visiting(object);
+	}
+
+	@Override
 	public R visitLoopVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopVariable object) {
 		return visiting(object);
 	}
@@ -89,17 +109,17 @@ public abstract class AbstractMergedQVTimperativeVisitor<R, C>
 	}
 
 	@Override
-	public R visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object) {
+	public R visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object) {
 		return visiting(object);
 	}
 
 	@Override
-	public R visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object) {
+	public R visitMappingParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameter object) {
 		return visiting(object);
 	}
 
 	@Override
-	public R visitMappingParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameter object) {
+	public R visitMappingParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameterBinding object) {
 		return visiting(object);
 	}
 
@@ -119,12 +139,17 @@ public abstract class AbstractMergedQVTimperativeVisitor<R, C>
 	}
 
 	@Override
-	public R visitOutConnectionVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull OutConnectionVariable object) {
+	public R visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
 		return visiting(object);
 	}
 
 	@Override
-	public R visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
+	public R visitSimpleParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameter object) {
+		return visiting(object);
+	}
+
+	@Override
+	public R visitSimpleParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameterBinding 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 1334cb9f4..4d9325688 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
@@ -50,6 +50,16 @@ public abstract class AbstractNullQVTimperativeVisitor<@Nullable R, C>
 	}
 
 	@Override
+	public R visitAppendParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull AppendParameterBinding object) {
+		return null;
+	}
+
+	@Override
+	public R visitBufferStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BufferStatement object) {
+		return null;
+	}
+
+	@Override
 	public R visitCheckStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CheckStatement object) {
 		return null;
 	}
@@ -70,6 +80,11 @@ public abstract class AbstractNullQVTimperativeVisitor<@Nullable R, C>
 	}
 
 	@Override
+	public R visitGuardParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardParameterBinding object) {
+		return null;
+	}
+
+	@Override
 	public R visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
 		return null;
 	}
@@ -80,6 +95,11 @@ public abstract class AbstractNullQVTimperativeVisitor<@Nullable R, C>
 	}
 
 	@Override
+	public R visitLoopParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopParameterBinding object) {
+		return null;
+	}
+
+	@Override
 	public R visitLoopVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopVariable object) {
 		return null;
 	}
@@ -95,17 +115,17 @@ public abstract class AbstractNullQVTimperativeVisitor<@Nullable R, C>
 	}
 
 	@Override
-	public R visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object) {
+	public R visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object) {
 		return null;
 	}
 
 	@Override
-	public R visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object) {
+	public R visitMappingParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameter object) {
 		return null;
 	}
 
 	@Override
-	public R visitMappingParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameter object) {
+	public R visitMappingParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameterBinding object) {
 		return null;
 	}
 
@@ -125,12 +145,17 @@ public abstract class AbstractNullQVTimperativeVisitor<@Nullable R, C>
 	}
 
 	@Override
-	public R visitOutConnectionVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull OutConnectionVariable object) {
+	public R visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
 		return null;
 	}
 
 	@Override
-	public R visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
+	public R visitSimpleParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameter object) {
+		return null;
+	}
+
+	@Override
+	public R visitSimpleParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameterBinding 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 c8228cbf2..ce3d783c1 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
@@ -54,6 +54,16 @@ public abstract class AbstractQVTimperativeAS2MonikerVisitor
 	}
 
 	@Override
+	public @Nullable Object visitAppendParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull AppendParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
+	public @Nullable Object visitBufferStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BufferStatement object) {
+		return visitConnectionVariable(object);
+	}
+
+	@Override
 	public @Nullable Object visitCheckStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CheckStatement object) {
 		return visitObservableStatement(object);
 	}
@@ -74,6 +84,11 @@ public abstract class AbstractQVTimperativeAS2MonikerVisitor
 	}
 
 	@Override
+	public @Nullable Object visitGuardParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public @Nullable Object visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
 		return visitBaseModel(object);
 	}
@@ -84,6 +99,11 @@ public abstract class AbstractQVTimperativeAS2MonikerVisitor
 	}
 
 	@Override
+	public @Nullable Object visitLoopParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public @Nullable Object visitLoopVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopVariable object) {
 		return visitVariableDeclaration(object);
 	}
@@ -99,11 +119,6 @@ public abstract class AbstractQVTimperativeAS2MonikerVisitor
 	}
 
 	@Override
-	public @Nullable Object visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object) {
-		return visitElement(object);
-	}
-
-	@Override
 	public @Nullable Object visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object) {
 		return visitMappingStatement(object);
 	}
@@ -114,6 +129,11 @@ public abstract class AbstractQVTimperativeAS2MonikerVisitor
 	}
 
 	@Override
+	public @Nullable Object visitMappingParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameterBinding object) {
+		return visitElement(object);
+	}
+
+	@Override
 	public @Nullable Object visitMappingStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingStatement object) {
 		return visitStatement(object);
 	}
@@ -129,13 +149,18 @@ public abstract class AbstractQVTimperativeAS2MonikerVisitor
 	}
 
 	@Override
-	public @Nullable Object visitOutConnectionVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull OutConnectionVariable object) {
-		return visitConnectionVariable(object);
+	public @Nullable Object visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
+		return visitObservableStatement(object);
 	}
 
 	@Override
-	public @Nullable Object visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
-		return visitObservableStatement(object);
+	public @Nullable Object visitSimpleParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameter object) {
+		return visitMappingParameter(object);
+	}
+
+	@Override
+	public @Nullable Object visitSimpleParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameterBinding object) {
+		return visitMappingParameterBinding(object);
 	}
 
 	@Override
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 6881d5f55..7925a703a 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
@@ -54,6 +54,16 @@ public abstract class AbstractQVTimperativeAS2XMIidVisitor
 	}
 
 	@Override
+	public @Nullable Boolean visitAppendParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull AppendParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
+	public @Nullable Boolean visitBufferStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BufferStatement object) {
+		return visitConnectionVariable(object);
+	}
+
+	@Override
 	public @Nullable Boolean visitCheckStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CheckStatement object) {
 		return visitObservableStatement(object);
 	}
@@ -74,6 +84,11 @@ public abstract class AbstractQVTimperativeAS2XMIidVisitor
 	}
 
 	@Override
+	public @Nullable Boolean visitGuardParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public @Nullable Boolean visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
 		return visitBaseModel(object);
 	}
@@ -84,6 +99,11 @@ public abstract class AbstractQVTimperativeAS2XMIidVisitor
 	}
 
 	@Override
+	public @Nullable Boolean visitLoopParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public @Nullable Boolean visitLoopVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopVariable object) {
 		return visitVariableDeclaration(object);
 	}
@@ -99,11 +119,6 @@ public abstract class AbstractQVTimperativeAS2XMIidVisitor
 	}
 
 	@Override
-	public @Nullable Boolean visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object) {
-		return visitElement(object);
-	}
-
-	@Override
 	public @Nullable Boolean visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object) {
 		return visitMappingStatement(object);
 	}
@@ -114,6 +129,11 @@ public abstract class AbstractQVTimperativeAS2XMIidVisitor
 	}
 
 	@Override
+	public @Nullable Boolean visitMappingParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameterBinding object) {
+		return visitElement(object);
+	}
+
+	@Override
 	public @Nullable Boolean visitMappingStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingStatement object) {
 		return visitStatement(object);
 	}
@@ -129,13 +149,18 @@ public abstract class AbstractQVTimperativeAS2XMIidVisitor
 	}
 
 	@Override
-	public @Nullable Boolean visitOutConnectionVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull OutConnectionVariable object) {
-		return visitConnectionVariable(object);
+	public @Nullable Boolean visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
+		return visitObservableStatement(object);
 	}
 
 	@Override
-	public @Nullable Boolean visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
-		return visitObservableStatement(object);
+	public @Nullable Boolean visitSimpleParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameter object) {
+		return visitMappingParameter(object);
+	}
+
+	@Override
+	public @Nullable Boolean visitSimpleParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameterBinding object) {
+		return visitMappingParameterBinding(object);
 	}
 
 	@Override
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 876ff5e2c..04b09f3be 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
@@ -54,6 +54,16 @@ public abstract class AbstractQVTimperativeASSaverLocateVisitor
 	}
 
 	@Override
+	public @Nullable Object visitAppendParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull AppendParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
+	public @Nullable Object visitBufferStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BufferStatement object) {
+		return visitConnectionVariable(object);
+	}
+
+	@Override
 	public @Nullable Object visitCheckStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CheckStatement object) {
 		return visitObservableStatement(object);
 	}
@@ -74,6 +84,11 @@ public abstract class AbstractQVTimperativeASSaverLocateVisitor
 	}
 
 	@Override
+	public @Nullable Object visitGuardParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public @Nullable Object visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
 		return visitBaseModel(object);
 	}
@@ -84,6 +99,11 @@ public abstract class AbstractQVTimperativeASSaverLocateVisitor
 	}
 
 	@Override
+	public @Nullable Object visitLoopParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public @Nullable Object visitLoopVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopVariable object) {
 		return visitVariableDeclaration(object);
 	}
@@ -99,11 +119,6 @@ public abstract class AbstractQVTimperativeASSaverLocateVisitor
 	}
 
 	@Override
-	public @Nullable Object visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object) {
-		return visitElement(object);
-	}
-
-	@Override
 	public @Nullable Object visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object) {
 		return visitMappingStatement(object);
 	}
@@ -114,6 +129,11 @@ public abstract class AbstractQVTimperativeASSaverLocateVisitor
 	}
 
 	@Override
+	public @Nullable Object visitMappingParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameterBinding object) {
+		return visitElement(object);
+	}
+
+	@Override
 	public @Nullable Object visitMappingStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingStatement object) {
 		return visitStatement(object);
 	}
@@ -129,13 +149,18 @@ public abstract class AbstractQVTimperativeASSaverLocateVisitor
 	}
 
 	@Override
-	public @Nullable Object visitOutConnectionVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull OutConnectionVariable object) {
-		return visitConnectionVariable(object);
+	public @Nullable Object visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
+		return visitObservableStatement(object);
 	}
 
 	@Override
-	public @Nullable Object visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
-		return visitObservableStatement(object);
+	public @Nullable Object visitSimpleParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameter object) {
+		return visitMappingParameter(object);
+	}
+
+	@Override
+	public @Nullable Object visitSimpleParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameterBinding object) {
+		return visitMappingParameterBinding(object);
 	}
 
 	@Override
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 58436f5d1..949f49406 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
@@ -56,6 +56,16 @@ public abstract class AbstractQVTimperativeASSaverNormalizeVisitor
 	}
 
 	@Override
+	public @Nullable Object visitAppendParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull AppendParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
+	public @Nullable Object visitBufferStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BufferStatement object) {
+		return visitConnectionVariable(object);
+	}
+
+	@Override
 	public @Nullable Object visitCheckStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CheckStatement object) {
 		return visitObservableStatement(object);
 	}
@@ -76,6 +86,11 @@ public abstract class AbstractQVTimperativeASSaverNormalizeVisitor
 	}
 
 	@Override
+	public @Nullable Object visitGuardParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public @Nullable Object visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
 		return visitBaseModel(object);
 	}
@@ -86,6 +101,11 @@ public abstract class AbstractQVTimperativeASSaverNormalizeVisitor
 	}
 
 	@Override
+	public @Nullable Object visitLoopParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public @Nullable Object visitLoopVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopVariable object) {
 		return visitVariableDeclaration(object);
 	}
@@ -101,11 +121,6 @@ public abstract class AbstractQVTimperativeASSaverNormalizeVisitor
 	}
 
 	@Override
-	public @Nullable Object visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object) {
-		return visitElement(object);
-	}
-
-	@Override
 	public @Nullable Object visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object) {
 		return visitMappingStatement(object);
 	}
@@ -116,6 +131,11 @@ public abstract class AbstractQVTimperativeASSaverNormalizeVisitor
 	}
 
 	@Override
+	public @Nullable Object visitMappingParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameterBinding object) {
+		return visitElement(object);
+	}
+
+	@Override
 	public @Nullable Object visitMappingStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingStatement object) {
 		return visitStatement(object);
 	}
@@ -131,13 +151,18 @@ public abstract class AbstractQVTimperativeASSaverNormalizeVisitor
 	}
 
 	@Override
-	public @Nullable Object visitOutConnectionVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull OutConnectionVariable object) {
-		return visitConnectionVariable(object);
+	public @Nullable Object visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
+		return visitObservableStatement(object);
 	}
 
 	@Override
-	public @Nullable Object visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
-		return visitObservableStatement(object);
+	public @Nullable Object visitSimpleParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameter object) {
+		return visitMappingParameter(object);
+	}
+
+	@Override
+	public @Nullable Object visitSimpleParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameterBinding object) {
+		return visitMappingParameterBinding(object);
 	}
 
 	@Override
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 e5229ff7a..9b99ce8b1 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
@@ -54,6 +54,16 @@ public abstract class AbstractQVTimperativeASSaverResolveVisitor
 	}
 
 	@Override
+	public @Nullable Object visitAppendParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull AppendParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
+	public @Nullable Object visitBufferStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BufferStatement object) {
+		return visitConnectionVariable(object);
+	}
+
+	@Override
 	public @Nullable Object visitCheckStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CheckStatement object) {
 		return visitObservableStatement(object);
 	}
@@ -74,6 +84,11 @@ public abstract class AbstractQVTimperativeASSaverResolveVisitor
 	}
 
 	@Override
+	public @Nullable Object visitGuardParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public @Nullable Object visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
 		return visitBaseModel(object);
 	}
@@ -84,6 +99,11 @@ public abstract class AbstractQVTimperativeASSaverResolveVisitor
 	}
 
 	@Override
+	public @Nullable Object visitLoopParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public @Nullable Object visitLoopVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopVariable object) {
 		return visitVariableDeclaration(object);
 	}
@@ -99,11 +119,6 @@ public abstract class AbstractQVTimperativeASSaverResolveVisitor
 	}
 
 	@Override
-	public @Nullable Object visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object) {
-		return visitElement(object);
-	}
-
-	@Override
 	public @Nullable Object visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object) {
 		return visitMappingStatement(object);
 	}
@@ -114,6 +129,11 @@ public abstract class AbstractQVTimperativeASSaverResolveVisitor
 	}
 
 	@Override
+	public @Nullable Object visitMappingParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameterBinding object) {
+		return visitElement(object);
+	}
+
+	@Override
 	public @Nullable Object visitMappingStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingStatement object) {
 		return visitStatement(object);
 	}
@@ -129,13 +149,18 @@ public abstract class AbstractQVTimperativeASSaverResolveVisitor
 	}
 
 	@Override
-	public @Nullable Object visitOutConnectionVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull OutConnectionVariable object) {
-		return visitConnectionVariable(object);
+	public @Nullable Object visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
+		return visitObservableStatement(object);
 	}
 
 	@Override
-	public @Nullable Object visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
-		return visitObservableStatement(object);
+	public @Nullable Object visitSimpleParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameter object) {
+		return visitMappingParameter(object);
+	}
+
+	@Override
+	public @Nullable Object visitSimpleParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameterBinding object) {
+		return visitMappingParameterBinding(object);
 	}
 
 	@Override
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 73ce699b4..3092ef9ea 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
@@ -57,6 +57,16 @@ public abstract class AbstractQVTimperativeTemplateParameterSubstitutionVisitor
 	}
 
 	@Override
+	public @Nullable Object visitAppendParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull AppendParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
+	public @Nullable Object visitBufferStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BufferStatement object) {
+		return visitConnectionVariable(object);
+	}
+
+	@Override
 	public @Nullable Object visitCheckStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CheckStatement object) {
 		return visitObservableStatement(object);
 	}
@@ -77,6 +87,11 @@ public abstract class AbstractQVTimperativeTemplateParameterSubstitutionVisitor
 	}
 
 	@Override
+	public @Nullable Object visitGuardParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public @Nullable Object visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
 		return visitBaseModel(object);
 	}
@@ -87,6 +102,11 @@ public abstract class AbstractQVTimperativeTemplateParameterSubstitutionVisitor
 	}
 
 	@Override
+	public @Nullable Object visitLoopParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopParameterBinding object) {
+		return visitMappingParameterBinding(object);
+	}
+
+	@Override
 	public @Nullable Object visitLoopVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopVariable object) {
 		return visitVariableDeclaration(object);
 	}
@@ -102,11 +122,6 @@ public abstract class AbstractQVTimperativeTemplateParameterSubstitutionVisitor
 	}
 
 	@Override
-	public @Nullable Object visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object) {
-		return visitElement(object);
-	}
-
-	@Override
 	public @Nullable Object visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object) {
 		return visitMappingStatement(object);
 	}
@@ -117,6 +132,11 @@ public abstract class AbstractQVTimperativeTemplateParameterSubstitutionVisitor
 	}
 
 	@Override
+	public @Nullable Object visitMappingParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameterBinding object) {
+		return visitElement(object);
+	}
+
+	@Override
 	public @Nullable Object visitMappingStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingStatement object) {
 		return visitStatement(object);
 	}
@@ -132,13 +152,18 @@ public abstract class AbstractQVTimperativeTemplateParameterSubstitutionVisitor
 	}
 
 	@Override
-	public @Nullable Object visitOutConnectionVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull OutConnectionVariable object) {
-		return visitConnectionVariable(object);
+	public @Nullable Object visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
+		return visitObservableStatement(object);
 	}
 
 	@Override
-	public @Nullable Object visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
-		return visitObservableStatement(object);
+	public @Nullable Object visitSimpleParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameter object) {
+		return visitMappingParameter(object);
+	}
+
+	@Override
+	public @Nullable Object visitSimpleParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameterBinding object) {
+		return visitMappingParameterBinding(object);
 	}
 
 	@Override
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 4ea53855a..c14d9a0d6 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
@@ -56,6 +56,30 @@ public abstract class AbstractWrappingQVTimperativeVisitor<R, C, @NonNull D exte
 	}
 
 	@Override
+	public R visitAppendParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull AppendParameterBinding object) {
+		@Nullable P prologue = preVisit(object);
+		try {
+			R result = delegate.visitAppendParameterBinding(object);
+			return postVisit(object, prologue, result);
+		}
+		catch (Throwable e) {
+			return badVisit(object, prologue, e);
+		}
+	}
+
+	@Override
+	public R visitBufferStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BufferStatement object) {
+		@Nullable P prologue = preVisit(object);
+		try {
+			R result = delegate.visitBufferStatement(object);
+			return postVisit(object, prologue, result);
+		}
+		catch (Throwable e) {
+			return badVisit(object, prologue, e);
+		}
+	}
+
+	@Override
 	public R visitCheckStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CheckStatement object) {
 		@Nullable P prologue = preVisit(object);
 		try {
@@ -104,6 +128,18 @@ public abstract class AbstractWrappingQVTimperativeVisitor<R, C, @NonNull D exte
 	}
 
 	@Override
+	public R visitGuardParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardParameterBinding object) {
+		@Nullable P prologue = preVisit(object);
+		try {
+			R result = delegate.visitGuardParameterBinding(object);
+			return postVisit(object, prologue, result);
+		}
+		catch (Throwable e) {
+			return badVisit(object, prologue, e);
+		}
+	}
+
+	@Override
 	public R visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object) {
 		@Nullable P prologue = preVisit(object);
 		try {
@@ -128,6 +164,18 @@ public abstract class AbstractWrappingQVTimperativeVisitor<R, C, @NonNull D exte
 	}
 
 	@Override
+	public R visitLoopParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopParameterBinding object) {
+		@Nullable P prologue = preVisit(object);
+		try {
+			R result = delegate.visitLoopParameterBinding(object);
+			return postVisit(object, prologue, result);
+		}
+		catch (Throwable e) {
+			return badVisit(object, prologue, e);
+		}
+	}
+
+	@Override
 	public R visitLoopVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopVariable object) {
 		@Nullable P prologue = preVisit(object);
 		try {
@@ -164,10 +212,10 @@ public abstract class AbstractWrappingQVTimperativeVisitor<R, C, @NonNull D exte
 	}
 
 	@Override
-	public R visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object) {
+	public R visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object) {
 		@Nullable P prologue = preVisit(object);
 		try {
-			R result = delegate.visitMappingCallBinding(object);
+			R result = delegate.visitMappingLoop(object);
 			return postVisit(object, prologue, result);
 		}
 		catch (Throwable e) {
@@ -176,10 +224,10 @@ public abstract class AbstractWrappingQVTimperativeVisitor<R, C, @NonNull D exte
 	}
 
 	@Override
-	public R visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object) {
+	public R visitMappingParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameter object) {
 		@Nullable P prologue = preVisit(object);
 		try {
-			R result = delegate.visitMappingLoop(object);
+			R result = delegate.visitMappingParameter(object);
 			return postVisit(object, prologue, result);
 		}
 		catch (Throwable e) {
@@ -188,10 +236,10 @@ public abstract class AbstractWrappingQVTimperativeVisitor<R, C, @NonNull D exte
 	}
 
 	@Override
-	public R visitMappingParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameter object) {
+	public R visitMappingParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameterBinding object) {
 		@Nullable P prologue = preVisit(object);
 		try {
-			R result = delegate.visitMappingParameter(object);
+			R result = delegate.visitMappingParameterBinding(object);
 			return postVisit(object, prologue, result);
 		}
 		catch (Throwable e) {
@@ -236,10 +284,10 @@ public abstract class AbstractWrappingQVTimperativeVisitor<R, C, @NonNull D exte
 	}
 
 	@Override
-	public R visitOutConnectionVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull OutConnectionVariable object) {
+	public R visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
 		@Nullable P prologue = preVisit(object);
 		try {
-			R result = delegate.visitOutConnectionVariable(object);
+			R result = delegate.visitSetStatement(object);
 			return postVisit(object, prologue, result);
 		}
 		catch (Throwable e) {
@@ -248,10 +296,22 @@ public abstract class AbstractWrappingQVTimperativeVisitor<R, C, @NonNull D exte
 	}
 
 	@Override
-	public R visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object) {
+	public R visitSimpleParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameter object) {
 		@Nullable P prologue = preVisit(object);
 		try {
-			R result = delegate.visitSetStatement(object);
+			R result = delegate.visitSimpleParameter(object);
+			return postVisit(object, prologue, result);
+		}
+		catch (Throwable e) {
+			return badVisit(object, prologue, e);
+		}
+	}
+
+	@Override
+	public R visitSimpleParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameterBinding object) {
+		@Nullable P prologue = preVisit(object);
+		try {
+			R result = delegate.visitSimpleParameterBinding(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 3300c4f3a..48f075c47 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
@@ -27,26 +27,31 @@ import org.eclipse.ocl.pivot.utilities.Nameable;
 import org.eclipse.qvtd.pivot.qvtbase.BaseModel;
 import org.eclipse.qvtd.pivot.qvtbase.Rule;
 import org.eclipse.qvtd.pivot.qvtbase.TypedModel;
+import org.eclipse.qvtd.pivot.qvtimperative.*;
 import org.eclipse.qvtd.pivot.qvtimperative.AddStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.AppendParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.AppendParameterBinding;
+import org.eclipse.qvtd.pivot.qvtimperative.BufferStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.CheckStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionVariable;
 import org.eclipse.qvtd.pivot.qvtimperative.DeclareStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.GuardParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeTypedModel;
 import org.eclipse.qvtd.pivot.qvtimperative.LoopVariable;
 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.MappingParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.NewStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.ObservableStatement;
-import org.eclipse.qvtd.pivot.qvtimperative.OutConnectionVariable;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
 import org.eclipse.qvtd.pivot.qvtimperative.SetStatement;
+import org.eclipse.qvtd.pivot.qvtimperative.SimpleParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.Statement;
 import org.eclipse.qvtd.pivot.qvtimperative.VariableStatement;
 
@@ -106,143 +111,163 @@ 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 caseAppendParameter(AppendParameter object) {
-			return createAppendParameterAdapter();
-		}
-		@Override
-		public Adapter caseCheckStatement(CheckStatement object) {
-			return createCheckStatementAdapter();
-		}
-		@Override
-		public Adapter caseConnectionVariable(ConnectionVariable object) {
-			return createConnectionVariableAdapter();
-		}
-		@Override
-		public Adapter caseDeclareStatement(DeclareStatement object) {
-			return createDeclareStatementAdapter();
-		}
-		@Override
-		public Adapter caseGuardParameter(GuardParameter object) {
-			return createGuardParameterAdapter();
-		}
-		@Override
-		public Adapter caseImperativeModel(ImperativeModel object) {
-			return createImperativeModelAdapter();
-		}
-		@Override
-		public Adapter caseImperativeTypedModel(ImperativeTypedModel object) {
-			return createImperativeTypedModelAdapter();
-		}
-		@Override
-		public Adapter caseLoopVariable(LoopVariable object) {
-			return createLoopVariableAdapter();
-		}
-		@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 caseMappingParameter(MappingParameter object) {
-			return createMappingParameterAdapter();
-		}
-		@Override
-		public Adapter caseMappingStatement(MappingStatement object) {
-			return createMappingStatementAdapter();
-		}
-		@Override
-		public Adapter caseNewStatement(NewStatement object) {
-			return createNewStatementAdapter();
-		}
-		@Override
-		public Adapter caseObservableStatement(ObservableStatement object) {
-			return createObservableStatementAdapter();
-		}
-		@Override
-		public Adapter caseOutConnectionVariable(OutConnectionVariable object) {
-			return createOutConnectionVariableAdapter();
-		}
-		@Override
-		public Adapter caseSetStatement(SetStatement object) {
-			return createSetStatementAdapter();
-		}
-		@Override
-		public Adapter caseStatement(Statement object) {
-			return createStatementAdapter();
-		}
-		@Override
-		public Adapter caseVariableStatement(VariableStatement object) {
-			return createVariableStatementAdapter();
-		}
-		@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 caseTypedElement(TypedElement object) {
-			return createTypedElementAdapter();
-		}
-		@Override
-		public Adapter caseVariableDeclaration(VariableDeclaration object) {
-			return createVariableDeclarationAdapter();
-		}
-		@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 caseTypedModel(TypedModel object) {
-			return createTypedModelAdapter();
-		}
-		@Override
-		public Adapter caseRule(Rule object) {
-			return createRuleAdapter();
-		}
-		@Override
-		public Adapter caseReferringElement(ReferringElement object) {
-			return createReferringElementAdapter();
-		}
-		@Override
-		public Adapter defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
+			@Override
+			public Adapter caseAddStatement(AddStatement object) {
+				return createAddStatementAdapter();
+			}
+			@Override
+			public Adapter caseAppendParameter(AppendParameter object) {
+				return createAppendParameterAdapter();
+			}
+			@Override
+			public Adapter caseAppendParameterBinding(AppendParameterBinding object) {
+				return createAppendParameterBindingAdapter();
+			}
+			@Override
+			public Adapter caseBufferStatement(BufferStatement object) {
+				return createBufferStatementAdapter();
+			}
+			@Override
+			public Adapter caseCheckStatement(CheckStatement object) {
+				return createCheckStatementAdapter();
+			}
+			@Override
+			public Adapter caseConnectionVariable(ConnectionVariable object) {
+				return createConnectionVariableAdapter();
+			}
+			@Override
+			public Adapter caseDeclareStatement(DeclareStatement object) {
+				return createDeclareStatementAdapter();
+			}
+			@Override
+			public Adapter caseGuardParameter(GuardParameter object) {
+				return createGuardParameterAdapter();
+			}
+			@Override
+			public Adapter caseGuardParameterBinding(GuardParameterBinding object) {
+				return createGuardParameterBindingAdapter();
+			}
+			@Override
+			public Adapter caseImperativeModel(ImperativeModel object) {
+				return createImperativeModelAdapter();
+			}
+			@Override
+			public Adapter caseImperativeTypedModel(ImperativeTypedModel object) {
+				return createImperativeTypedModelAdapter();
+			}
+			@Override
+			public Adapter caseLoopParameterBinding(LoopParameterBinding object) {
+				return createLoopParameterBindingAdapter();
+			}
+			@Override
+			public Adapter caseLoopVariable(LoopVariable object) {
+				return createLoopVariableAdapter();
+			}
+			@Override
+			public Adapter caseMapping(Mapping object) {
+				return createMappingAdapter();
+			}
+			@Override
+			public Adapter caseMappingCall(MappingCall object) {
+				return createMappingCallAdapter();
+			}
+			@Override
+			public Adapter caseMappingLoop(MappingLoop object) {
+				return createMappingLoopAdapter();
+			}
+			@Override
+			public Adapter caseMappingParameter(MappingParameter object) {
+				return createMappingParameterAdapter();
+			}
+			@Override
+			public Adapter caseMappingParameterBinding(MappingParameterBinding object) {
+				return createMappingParameterBindingAdapter();
+			}
+			@Override
+			public Adapter caseMappingStatement(MappingStatement object) {
+				return createMappingStatementAdapter();
+			}
+			@Override
+			public Adapter caseNewStatement(NewStatement object) {
+				return createNewStatementAdapter();
+			}
+			@Override
+			public Adapter caseObservableStatement(ObservableStatement object) {
+				return createObservableStatementAdapter();
+			}
+			@Override
+			public Adapter caseSetStatement(SetStatement object) {
+				return createSetStatementAdapter();
+			}
+			@Override
+			public Adapter caseSimpleParameter(SimpleParameter object) {
+				return createSimpleParameterAdapter();
+			}
+			@Override
+			public Adapter caseSimpleParameterBinding(SimpleParameterBinding object) {
+				return createSimpleParameterBindingAdapter();
+			}
+			@Override
+			public Adapter caseStatement(Statement object) {
+				return createStatementAdapter();
+			}
+			@Override
+			public Adapter caseVariableStatement(VariableStatement object) {
+				return createVariableStatementAdapter();
+			}
+			@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 caseTypedElement(TypedElement object) {
+				return createTypedElementAdapter();
+			}
+			@Override
+			public Adapter caseVariableDeclaration(VariableDeclaration object) {
+				return createVariableDeclarationAdapter();
+			}
+			@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 caseTypedModel(TypedModel object) {
+				return createTypedModelAdapter();
+			}
+			@Override
+			public Adapter caseRule(Rule object) {
+				return createRuleAdapter();
+			}
+			@Override
+			public Adapter caseReferringElement(ReferringElement object) {
+				return createReferringElementAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
@@ -287,6 +312,34 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.AppendParameterBinding <em>Append Parameter Binding</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.AppendParameterBinding
+	 * @generated
+	 */
+	public Adapter createAppendParameterBindingAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.BufferStatement <em>Buffer 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.BufferStatement
+	 * @generated
+	 */
+	public Adapter createBufferStatementAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.CheckStatement <em>Check Statement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
@@ -343,6 +396,20 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding <em>Guard Parameter Binding</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.GuardParameterBinding
+	 * @generated
+	 */
+	public Adapter createGuardParameterBindingAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel <em>Imperative Model</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
@@ -371,6 +438,20 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.LoopParameterBinding <em>Loop Parameter Binding</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.LoopParameterBinding
+	 * @generated
+	 */
+	public Adapter createLoopParameterBindingAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.LoopVariable <em>Loop Variable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
@@ -413,44 +494,44 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingCallBinding <em>Mapping Call Binding</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingLoop <em>Mapping Loop</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.MappingCallBinding
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingLoop
 	 * @generated
 	 */
-	public Adapter createMappingCallBindingAdapter() {
+	public Adapter createMappingLoopAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingLoop <em>Mapping Loop</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingParameter <em>Mapping Parameter</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.MappingLoop
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingParameter
 	 * @generated
 	 */
-	public Adapter createMappingLoopAdapter() {
+	public Adapter createMappingParameterAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingParameter <em>Mapping Parameter</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding <em>Mapping Parameter Binding</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.MappingParameter
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding
 	 * @generated
 	 */
-	public Adapter createMappingParameterAdapter() {
+	public Adapter createMappingParameterBindingAdapter() {
 		return null;
 	}
 
@@ -497,30 +578,44 @@ public class QVTimperativeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.OutConnectionVariable <em>Out Connection Variable</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.SetStatement <em>Set 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.OutConnectionVariable
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.SetStatement
 	 * @generated
 	 */
-	public Adapter createOutConnectionVariableAdapter() {
+	public Adapter createSetStatementAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.SetStatement <em>Set Statement</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.SimpleParameter <em>Simple Parameter</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.SetStatement
+	 * @see org.eclipse.qvtd.pivot.qvtimperative.SimpleParameter
 	 * @generated
 	 */
-	public Adapter createSetStatementAdapter() {
+	public Adapter createSimpleParameterAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding <em>Simple Parameter Binding</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.SimpleParameterBinding
+	 * @generated
+	 */
+	public Adapter createSimpleParameterBindingAdapter() {
 		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 16ad98d36..8ff6e54ea 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
@@ -26,26 +26,31 @@ import org.eclipse.ocl.pivot.utilities.Nameable;
 import org.eclipse.qvtd.pivot.qvtbase.BaseModel;
 import org.eclipse.qvtd.pivot.qvtbase.Rule;
 import org.eclipse.qvtd.pivot.qvtbase.TypedModel;
+import org.eclipse.qvtd.pivot.qvtimperative.*;
 import org.eclipse.qvtd.pivot.qvtimperative.AddStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.AppendParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.AppendParameterBinding;
+import org.eclipse.qvtd.pivot.qvtimperative.BufferStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.CheckStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.ConnectionVariable;
 import org.eclipse.qvtd.pivot.qvtimperative.DeclareStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.GuardParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.GuardParameterBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeModel;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeTypedModel;
 import org.eclipse.qvtd.pivot.qvtimperative.LoopVariable;
 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.MappingParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.MappingParameterBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.MappingStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.NewStatement;
 import org.eclipse.qvtd.pivot.qvtimperative.ObservableStatement;
-import org.eclipse.qvtd.pivot.qvtimperative.OutConnectionVariable;
 import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativePackage;
 import org.eclipse.qvtd.pivot.qvtimperative.SetStatement;
+import org.eclipse.qvtd.pivot.qvtimperative.SimpleParameter;
+import org.eclipse.qvtd.pivot.qvtimperative.SimpleParameterBinding;
 import org.eclipse.qvtd.pivot.qvtimperative.Statement;
 import org.eclipse.qvtd.pivot.qvtimperative.VariableStatement;
 
@@ -133,6 +138,31 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case QVTimperativePackage.APPEND_PARAMETER_BINDING: {
+				AppendParameterBinding appendParameterBinding = (AppendParameterBinding)theEObject;
+				T result = caseAppendParameterBinding(appendParameterBinding);
+				if (result == null) result = caseMappingParameterBinding(appendParameterBinding);
+				if (result == null) result = caseElement(appendParameterBinding);
+				if (result == null) result = caseVisitable(appendParameterBinding);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case QVTimperativePackage.BUFFER_STATEMENT: {
+				BufferStatement bufferStatement = (BufferStatement)theEObject;
+				T result = caseBufferStatement(bufferStatement);
+				if (result == null) result = caseConnectionVariable(bufferStatement);
+				if (result == null) result = caseVariableStatement(bufferStatement);
+				if (result == null) result = caseObservableStatement(bufferStatement);
+				if (result == null) result = caseVariableDeclaration(bufferStatement);
+				if (result == null) result = caseStatement(bufferStatement);
+				if (result == null) result = caseTypedElement(bufferStatement);
+				if (result == null) result = caseNamedElement(bufferStatement);
+				if (result == null) result = caseElement(bufferStatement);
+				if (result == null) result = caseNameable(bufferStatement);
+				if (result == null) result = caseVisitable(bufferStatement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case QVTimperativePackage.CHECK_STATEMENT: {
 				CheckStatement checkStatement = (CheckStatement)theEObject;
 				T result = caseCheckStatement(checkStatement);
@@ -185,6 +215,15 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case QVTimperativePackage.GUARD_PARAMETER_BINDING: {
+				GuardParameterBinding guardParameterBinding = (GuardParameterBinding)theEObject;
+				T result = caseGuardParameterBinding(guardParameterBinding);
+				if (result == null) result = caseMappingParameterBinding(guardParameterBinding);
+				if (result == null) result = caseElement(guardParameterBinding);
+				if (result == null) result = caseVisitable(guardParameterBinding);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case QVTimperativePackage.IMPERATIVE_MODEL: {
 				ImperativeModel imperativeModel = (ImperativeModel)theEObject;
 				T result = caseImperativeModel(imperativeModel);
@@ -209,6 +248,15 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case QVTimperativePackage.LOOP_PARAMETER_BINDING: {
+				LoopParameterBinding loopParameterBinding = (LoopParameterBinding)theEObject;
+				T result = caseLoopParameterBinding(loopParameterBinding);
+				if (result == null) result = caseMappingParameterBinding(loopParameterBinding);
+				if (result == null) result = caseElement(loopParameterBinding);
+				if (result == null) result = caseVisitable(loopParameterBinding);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case QVTimperativePackage.LOOP_VARIABLE: {
 				LoopVariable loopVariable = (LoopVariable)theEObject;
 				T result = caseLoopVariable(loopVariable);
@@ -245,14 +293,6 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case QVTimperativePackage.MAPPING_CALL_BINDING: {
-				MappingCallBinding mappingCallBinding = (MappingCallBinding)theEObject;
-				T result = caseMappingCallBinding(mappingCallBinding);
-				if (result == null) result = caseElement(mappingCallBinding);
-				if (result == null) result = caseVisitable(mappingCallBinding);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			case QVTimperativePackage.MAPPING_LOOP: {
 				MappingLoop mappingLoop = (MappingLoop)theEObject;
 				T result = caseMappingLoop(mappingLoop);
@@ -278,6 +318,14 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case QVTimperativePackage.MAPPING_PARAMETER_BINDING: {
+				MappingParameterBinding mappingParameterBinding = (MappingParameterBinding)theEObject;
+				T result = caseMappingParameterBinding(mappingParameterBinding);
+				if (result == null) result = caseElement(mappingParameterBinding);
+				if (result == null) result = caseVisitable(mappingParameterBinding);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case QVTimperativePackage.MAPPING_STATEMENT: {
 				MappingStatement mappingStatement = (MappingStatement)theEObject;
 				T result = caseMappingStatement(mappingStatement);
@@ -315,22 +363,6 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case QVTimperativePackage.OUT_CONNECTION_VARIABLE: {
-				OutConnectionVariable outConnectionVariable = (OutConnectionVariable)theEObject;
-				T result = caseOutConnectionVariable(outConnectionVariable);
-				if (result == null) result = caseConnectionVariable(outConnectionVariable);
-				if (result == null) result = caseVariableStatement(outConnectionVariable);
-				if (result == null) result = caseObservableStatement(outConnectionVariable);
-				if (result == null) result = caseVariableDeclaration(outConnectionVariable);
-				if (result == null) result = caseStatement(outConnectionVariable);
-				if (result == null) result = caseTypedElement(outConnectionVariable);
-				if (result == null) result = caseNamedElement(outConnectionVariable);
-				if (result == null) result = caseElement(outConnectionVariable);
-				if (result == null) result = caseNameable(outConnectionVariable);
-				if (result == null) result = caseVisitable(outConnectionVariable);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			case QVTimperativePackage.SET_STATEMENT: {
 				SetStatement setStatement = (SetStatement)theEObject;
 				T result = caseSetStatement(setStatement);
@@ -343,6 +375,28 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case QVTimperativePackage.SIMPLE_PARAMETER: {
+				SimpleParameter simpleParameter = (SimpleParameter)theEObject;
+				T result = caseSimpleParameter(simpleParameter);
+				if (result == null) result = caseMappingParameter(simpleParameter);
+				if (result == null) result = caseVariableDeclaration(simpleParameter);
+				if (result == null) result = caseTypedElement(simpleParameter);
+				if (result == null) result = caseNamedElement(simpleParameter);
+				if (result == null) result = caseElement(simpleParameter);
+				if (result == null) result = caseNameable(simpleParameter);
+				if (result == null) result = caseVisitable(simpleParameter);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case QVTimperativePackage.SIMPLE_PARAMETER_BINDING: {
+				SimpleParameterBinding simpleParameterBinding = (SimpleParameterBinding)theEObject;
+				T result = caseSimpleParameterBinding(simpleParameterBinding);
+				if (result == null) result = caseMappingParameterBinding(simpleParameterBinding);
+				if (result == null) result = caseElement(simpleParameterBinding);
+				if (result == null) result = caseVisitable(simpleParameterBinding);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case QVTimperativePackage.STATEMENT: {
 				Statement statement = (Statement)theEObject;
 				T result = caseStatement(statement);
@@ -401,6 +455,36 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Append Parameter Binding</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>Append Parameter Binding</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAppendParameterBinding(AppendParameterBinding object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Buffer 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>Buffer Statement</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseBufferStatement(BufferStatement object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Check Statement</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
@@ -461,6 +545,21 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Guard Parameter Binding</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>Guard Parameter Binding</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseGuardParameterBinding(GuardParameterBinding object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Imperative Model</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
@@ -491,6 +590,21 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Loop Parameter Binding</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>Loop Parameter Binding</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseLoopParameterBinding(LoopParameterBinding object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Loop Variable</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
@@ -536,47 +650,47 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Mapping Call Binding</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Mapping Loop</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>Mapping Call Binding</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Mapping Loop</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseMappingCallBinding(MappingCallBinding object) {
+	public T caseMappingLoop(MappingLoop object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Mapping Loop</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Mapping Parameter</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>Mapping Loop</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Mapping Parameter</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseMappingLoop(MappingLoop object) {
+	public T caseMappingParameter(MappingParameter object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Mapping Parameter</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Mapping Parameter Binding</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>Mapping Parameter</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Mapping Parameter Binding</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseMappingParameter(MappingParameter object) {
+	public T caseMappingParameterBinding(MappingParameterBinding object) {
 		return null;
 	}
 
@@ -626,32 +740,47 @@ public class QVTimperativeSwitch<@Nullable T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Out Connection Variable</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Set 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>Out Connection Variable</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Set Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseOutConnectionVariable(OutConnectionVariable object) {
+	public T caseSetStatement(SetStatement object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Set Statement</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Simple Parameter</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>Set Statement</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Simple Parameter</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseSetStatement(SetStatement object) {
+	public T caseSimpleParameter(SimpleParameter object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Simple Parameter Binding</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>Simple Parameter Binding</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSimpleParameterBinding(SimpleParameterBinding 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 187fbd64b..6a8879e37 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
@@ -25,23 +25,28 @@ public interface QVTimperativeVisitor<R> extends org.eclipse.qvtd.pivot.qvtbase.
 {
 	R visitAddStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull AddStatement object);
 	R visitAppendParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull AppendParameter object);
+	R visitAppendParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull AppendParameterBinding object);
+	R visitBufferStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull BufferStatement object);
 	R visitCheckStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull CheckStatement object);
 	R visitConnectionVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ConnectionVariable object);
 	R visitDeclareStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull DeclareStatement object);
 	R visitGuardParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardParameter object);
+	R visitGuardParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull GuardParameterBinding object);
 	R visitImperativeModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeModel object);
 	R visitImperativeTypedModel(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ImperativeTypedModel object);
+	R visitLoopParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopParameterBinding object);
 	R visitLoopVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull LoopVariable object);
 	R visitMapping(org.eclipse.qvtd.pivot.qvtimperative.@NonNull Mapping object);
 	R visitMappingCall(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCall object);
-	R visitMappingCallBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingCallBinding object);
 	R visitMappingLoop(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingLoop object);
 	R visitMappingParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameter object);
+	R visitMappingParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingParameterBinding object);
 	R visitMappingStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull MappingStatement object);
 	R visitNewStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull NewStatement object);
 	R visitObservableStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull ObservableStatement object);
-	R visitOutConnectionVariable(org.eclipse.qvtd.pivot.qvtimperative.@NonNull OutConnectionVariable object);
 	R visitSetStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SetStatement object);
+	R visitSimpleParameter(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameter object);
+	R visitSimpleParameterBinding(org.eclipse.qvtd.pivot.qvtimperative.@NonNull SimpleParameterBinding object);
 	R visitStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull Statement object);
 	R visitVariableStatement(org.eclipse.qvtd.pivot.qvtimperative.@NonNull VariableStatement object);
 }
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/impl/QVTrelationFactoryImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/impl/QVTrelationFactoryImpl.java
index 95668c462..a404b72e7 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/impl/QVTrelationFactoryImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/impl/QVTrelationFactoryImpl.java
@@ -15,7 +15,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.qvtd.pivot.qvtrelation.*;
 import org.eclipse.qvtd.pivot.qvtrelation.DomainPattern;
 import org.eclipse.qvtd.pivot.qvtrelation.Key;
 import org.eclipse.qvtd.pivot.qvtrelation.QVTrelationFactory;
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationAdapterFactory.java b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationAdapterFactory.java
index 09f6a55c9..d5e380d7a 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationAdapterFactory.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationAdapterFactory.java
@@ -31,7 +31,6 @@ import org.eclipse.qvtd.pivot.qvtbase.Domain;
 import org.eclipse.qvtd.pivot.qvtbase.Pattern;
 import org.eclipse.qvtd.pivot.qvtbase.Rule;
 import org.eclipse.qvtd.pivot.qvtbase.Transformation;
-import org.eclipse.qvtd.pivot.qvtrelation.*;
 import org.eclipse.qvtd.pivot.qvtrelation.DomainPattern;
 import org.eclipse.qvtd.pivot.qvtrelation.Key;
 import org.eclipse.qvtd.pivot.qvtrelation.QVTrelationPackage;
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationSwitch.java b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationSwitch.java
index ddc01b5c8..743bb8c2c 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationSwitch.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationSwitch.java
@@ -30,7 +30,6 @@ import org.eclipse.qvtd.pivot.qvtbase.Domain;
 import org.eclipse.qvtd.pivot.qvtbase.Pattern;
 import org.eclipse.qvtd.pivot.qvtbase.Rule;
 import org.eclipse.qvtd.pivot.qvtbase.Transformation;
-import org.eclipse.qvtd.pivot.qvtrelation.*;
 import org.eclipse.qvtd.pivot.qvtrelation.DomainPattern;
 import org.eclipse.qvtd.pivot.qvtrelation.Key;
 import org.eclipse.qvtd.pivot.qvtrelation.QVTrelationPackage;
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/impl/QVTtemplateFactoryImpl.java b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/impl/QVTtemplateFactoryImpl.java
index a6720ce11..ca10bd477 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/impl/QVTtemplateFactoryImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/impl/QVTtemplateFactoryImpl.java
@@ -15,7 +15,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.qvtd.pivot.qvttemplate.*;
 import org.eclipse.qvtd.pivot.qvttemplate.CollectionTemplateExp;
 import org.eclipse.qvtd.pivot.qvttemplate.ObjectTemplateExp;
 import org.eclipse.qvtd.pivot.qvttemplate.PropertyTemplateItem;
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/QVTtemplateAdapterFactory.java b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/QVTtemplateAdapterFactory.java
index a8713c012..f7b58c31b 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/QVTtemplateAdapterFactory.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/QVTtemplateAdapterFactory.java
@@ -22,7 +22,6 @@ import org.eclipse.ocl.pivot.OCLExpression;
 import org.eclipse.ocl.pivot.TypedElement;
 import org.eclipse.ocl.pivot.util.Visitable;
 import org.eclipse.ocl.pivot.utilities.Nameable;
-import org.eclipse.qvtd.pivot.qvttemplate.*;
 import org.eclipse.qvtd.pivot.qvttemplate.CollectionTemplateExp;
 import org.eclipse.qvtd.pivot.qvttemplate.ObjectTemplateExp;
 import org.eclipse.qvtd.pivot.qvttemplate.PropertyTemplateItem;
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/QVTtemplateSwitch.java b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/QVTtemplateSwitch.java
index d589085bd..b8f036ec1 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/QVTtemplateSwitch.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/QVTtemplateSwitch.java
@@ -21,7 +21,6 @@ import org.eclipse.ocl.pivot.OCLExpression;
 import org.eclipse.ocl.pivot.TypedElement;
 import org.eclipse.ocl.pivot.util.Visitable;
 import org.eclipse.ocl.pivot.utilities.Nameable;
-import org.eclipse.qvtd.pivot.qvttemplate.*;
 import org.eclipse.qvtd.pivot.qvttemplate.CollectionTemplateExp;
 import org.eclipse.qvtd.pivot.qvttemplate.ObjectTemplateExp;
 import org.eclipse.qvtd.pivot.qvttemplate.PropertyTemplateItem;
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase/emf-gen/org/eclipse/qvtd/xtext/qvtbasecs/util/QVTbaseCSAdapterFactory.java b/plugins/org.eclipse.qvtd.xtext.qvtbase/emf-gen/org/eclipse/qvtd/xtext/qvtbasecs/util/QVTbaseCSAdapterFactory.java
index 4a2b02c09..5111317a8 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtbase/emf-gen/org/eclipse/qvtd/xtext/qvtbasecs/util/QVTbaseCSAdapterFactory.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtbase/emf-gen/org/eclipse/qvtd/xtext/qvtbasecs/util/QVTbaseCSAdapterFactory.java
@@ -28,7 +28,6 @@ import org.eclipse.ocl.xtext.basecs.PivotableElementCS;
 import org.eclipse.ocl.xtext.basecs.TemplateableElementCS;
 import org.eclipse.ocl.xtext.basecs.TypeCS;
 import org.eclipse.ocl.xtext.basecs.util.VisitableCS;
-import org.eclipse.qvtd.xtext.qvtbasecs.*;
 import org.eclipse.qvtd.xtext.qvtbasecs.AbstractTransformationCS;
 import org.eclipse.qvtd.xtext.qvtbasecs.QVTbaseCSPackage;
 import org.eclipse.qvtd.xtext.qvtbasecs.QualifiedPackageCS;
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase/emf-gen/org/eclipse/qvtd/xtext/qvtbasecs/util/QVTbaseCSSwitch.java b/plugins/org.eclipse.qvtd.xtext.qvtbase/emf-gen/org/eclipse/qvtd/xtext/qvtbasecs/util/QVTbaseCSSwitch.java
index cbac85145..668562d50 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtbase/emf-gen/org/eclipse/qvtd/xtext/qvtbasecs/util/QVTbaseCSSwitch.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtbase/emf-gen/org/eclipse/qvtd/xtext/qvtbasecs/util/QVTbaseCSSwitch.java
@@ -27,7 +27,6 @@ import org.eclipse.ocl.xtext.basecs.PivotableElementCS;
 import org.eclipse.ocl.xtext.basecs.TemplateableElementCS;
 import org.eclipse.ocl.xtext.basecs.TypeCS;
 import org.eclipse.ocl.xtext.basecs.util.VisitableCS;
-import org.eclipse.qvtd.xtext.qvtbasecs.*;
 import org.eclipse.qvtd.xtext.qvtbasecs.AbstractTransformationCS;
 import org.eclipse.qvtd.xtext.qvtbasecs.QVTbaseCSPackage;
 import org.eclipse.qvtd.xtext.qvtbasecs.QualifiedPackageCS;
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/AbstractQVTimperativeProposalProvider.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/AbstractQVTimperativeProposalProvider.java
index 9086e8111..794cef4b7 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/AbstractQVTimperativeProposalProvider.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/AbstractQVTimperativeProposalProvider.java
@@ -47,19 +47,34 @@ public class AbstractQVTimperativeProposalProvider extends org.eclipse.qvtd.xtex
 	public void completeAddStatementCS_OwnedExpression(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
+	public void completeAppendParameterBindingCS_ReferredVariable(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeAppendParameterBindingCS_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	}
 	public void completeAppendParameterCS_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
 	public void completeAppendParameterCS_OwnedType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
+	public void completeBufferStatementCS_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeBufferStatementCS_OwnedType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeBufferStatementCS_OwnedExpression(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	}
 	public void completeCheckStatementCS_OwnedCondition(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
 	public void completeDeclareStatementCS_ObservedProperties(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeDeclareStatementCS_IsChecked(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void completeDeclareStatementCS_IsCheck(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
 	public void completeDeclareStatementCS_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
@@ -83,6 +98,15 @@ public class AbstractQVTimperativeProposalProvider extends org.eclipse.qvtd.xtex
 	public void completeDirectionCS_Imports(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
 	}
+	public void completeGuardParameterBindingCS_IsCheck(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
+	public void completeGuardParameterBindingCS_ReferredVariable(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeGuardParameterBindingCS_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	}
 	public void completeGuardParameterCS_ReferredTypedModel(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
 	}
@@ -101,6 +125,15 @@ public class AbstractQVTimperativeProposalProvider extends org.eclipse.qvtd.xtex
 	public void completeImportCS_IsAll(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
+	public void completeLoopParameterBindingCS_IsCheck(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
+	public void completeLoopParameterBindingCS_ReferredVariable(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeLoopParameterBindingCS_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	}
 	public void completeMappingCS_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
@@ -116,18 +149,18 @@ public class AbstractQVTimperativeProposalProvider extends org.eclipse.qvtd.xtex
 	public void completeMappingCallCS_IsInfinite(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
+	public void completeMappingCallCS_IsInstall(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
+	public void completeMappingCallCS_IsInvoke(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
 	public void completeMappingCallCS_OwnedPathName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
 	public void completeMappingCallCS_OwnedBindings(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeMappingCallBindingCS_ReferredVariable(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeMappingCallBindingCS_OwnedValue(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
 	public void completeMappingLoopCS_ObservedProperties(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
@@ -161,15 +194,6 @@ public class AbstractQVTimperativeProposalProvider extends org.eclipse.qvtd.xtex
 	public void completeNewStatementCS_OwnedExpression(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
-	public void completeOutVariableCS_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeOutVariableCS_OwnedType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeOutVariableCS_OwnedExpression(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
 	public void completeParamDeclarationCS_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
@@ -231,6 +255,24 @@ public class AbstractQVTimperativeProposalProvider extends org.eclipse.qvtd.xtex
 	public void completeSetStatementCS_OwnedExpression(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
+	public void completeSimpleParameterBindingCS_IsCheck(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
+	public void completeSimpleParameterBindingCS_ReferredVariable(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeSimpleParameterBindingCS_OwnedValue(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeSimpleParameterCS_ReferredTypedModel(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeSimpleParameterCS_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	}
+	public void completeSimpleParameterCS_OwnedType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
+	}
 	public void completeTransformationCS_OwnedPathName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
@@ -247,9 +289,15 @@ public class AbstractQVTimperativeProposalProvider extends org.eclipse.qvtd.xtex
 	public void complete_AddStatementCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
+	public void complete_AppendParameterBindingCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
 	public void complete_AppendParameterCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
+	public void complete_BufferStatementCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
 	public void complete_CommitStatementCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
@@ -265,6 +313,9 @@ public class AbstractQVTimperativeProposalProvider extends org.eclipse.qvtd.xtex
 	public void complete_DirectionCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
+	public void complete_GuardParameterBindingCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
 	public void complete_GuardParameterCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
@@ -274,13 +325,13 @@ public class AbstractQVTimperativeProposalProvider extends org.eclipse.qvtd.xtex
 	public void complete_ImportCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_MappingCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void complete_LoopParameterBindingCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_MappingCallCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void complete_MappingCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_MappingCallBindingCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void complete_MappingCallCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
 	public void complete_MappingLoopCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
@@ -289,13 +340,13 @@ public class AbstractQVTimperativeProposalProvider extends org.eclipse.qvtd.xtex
 	public void complete_MappingIteratorCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_MappingParameterCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void complete_MappingParameterBindingCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_NewStatementCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void complete_MappingParameterCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_OutVariableCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void complete_NewStatementCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
 	public void complete_ParamDeclarationCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
@@ -313,6 +364,12 @@ public class AbstractQVTimperativeProposalProvider extends org.eclipse.qvtd.xtex
 	public void complete_SetStatementCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
+	public void complete_SimpleParameterBindingCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
+	public void complete_SimpleParameterCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// subclasses may override
+	}
 	public void complete_TransformationCS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/QVTimperativeParser.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/QVTimperativeParser.java
index 04e9bdbbc..7e2b3cd6a 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/QVTimperativeParser.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/QVTimperativeParser.java
@@ -49,6 +49,8 @@ public class QVTimperativeParser extends AbstractContentAssistParser {
 					put(grammarAccess.getControlStatementCSAccess().getAlternatives(), "rule__ControlStatementCS__Alternatives");
 					put(grammarAccess.getDirectionCSAccess().getAlternatives_1(), "rule__DirectionCS__Alternatives_1");
 					put(grammarAccess.getGuardStatementCSAccess().getAlternatives(), "rule__GuardStatementCS__Alternatives");
+					put(grammarAccess.getMappingCallCSAccess().getAlternatives_2(), "rule__MappingCallCS__Alternatives_2");
+					put(grammarAccess.getMappingParameterBindingCSAccess().getAlternatives(), "rule__MappingParameterBindingCS__Alternatives");
 					put(grammarAccess.getMappingParameterCSAccess().getAlternatives(), "rule__MappingParameterCS__Alternatives");
 					put(grammarAccess.getQualifiedPackageCSAccess().getAlternatives_5(), "rule__QualifiedPackageCS__Alternatives_5");
 					put(grammarAccess.getQualifiedPackageCSAccess().getAlternatives_5_0_1(), "rule__QualifiedPackageCS__Alternatives_5_0_1");
@@ -112,7 +114,11 @@ public class QVTimperativeParser extends AbstractContentAssistParser {
 					put(grammarAccess.getAddStatementCSAccess().getGroup(), "rule__AddStatementCS__Group__0");
 					put(grammarAccess.getAddStatementCSAccess().getGroup_0(), "rule__AddStatementCS__Group_0__0");
 					put(grammarAccess.getAddStatementCSAccess().getGroup_0_2(), "rule__AddStatementCS__Group_0_2__0");
+					put(grammarAccess.getAppendParameterBindingCSAccess().getGroup(), "rule__AppendParameterBindingCS__Group__0");
 					put(grammarAccess.getAppendParameterCSAccess().getGroup(), "rule__AppendParameterCS__Group__0");
+					put(grammarAccess.getBufferStatementCSAccess().getGroup(), "rule__BufferStatementCS__Group__0");
+					put(grammarAccess.getBufferStatementCSAccess().getGroup_2(), "rule__BufferStatementCS__Group_2__0");
+					put(grammarAccess.getBufferStatementCSAccess().getGroup_3(), "rule__BufferStatementCS__Group_3__0");
 					put(grammarAccess.getCheckStatementCSAccess().getGroup(), "rule__CheckStatementCS__Group__0");
 					put(grammarAccess.getDeclareStatementCSAccess().getGroup(), "rule__DeclareStatementCS__Group__0");
 					put(grammarAccess.getDeclareStatementCSAccess().getGroup_0(), "rule__DeclareStatementCS__Group_0__0");
@@ -120,14 +126,15 @@ public class QVTimperativeParser extends AbstractContentAssistParser {
 					put(grammarAccess.getDeclareStatementCSAccess().getGroup_4(), "rule__DeclareStatementCS__Group_4__0");
 					put(grammarAccess.getDirectionCSAccess().getGroup(), "rule__DirectionCS__Group__0");
 					put(grammarAccess.getDirectionCSAccess().getGroup_5(), "rule__DirectionCS__Group_5__0");
+					put(grammarAccess.getGuardParameterBindingCSAccess().getGroup(), "rule__GuardParameterBindingCS__Group__0");
 					put(grammarAccess.getGuardParameterCSAccess().getGroup(), "rule__GuardParameterCS__Group__0");
 					put(grammarAccess.getImportCSAccess().getGroup(), "rule__ImportCS__Group__0");
 					put(grammarAccess.getImportCSAccess().getGroup_1(), "rule__ImportCS__Group_1__0");
 					put(grammarAccess.getImportCSAccess().getGroup_3(), "rule__ImportCS__Group_3__0");
+					put(grammarAccess.getLoopParameterBindingCSAccess().getGroup(), "rule__LoopParameterBindingCS__Group__0");
 					put(grammarAccess.getMappingCSAccess().getGroup(), "rule__MappingCS__Group__0");
 					put(grammarAccess.getMappingCSAccess().getGroup_3(), "rule__MappingCS__Group_3__0");
 					put(grammarAccess.getMappingCallCSAccess().getGroup(), "rule__MappingCallCS__Group__0");
-					put(grammarAccess.getMappingCallBindingCSAccess().getGroup(), "rule__MappingCallBindingCS__Group__0");
 					put(grammarAccess.getMappingLoopCSAccess().getGroup(), "rule__MappingLoopCS__Group__0");
 					put(grammarAccess.getMappingLoopCSAccess().getGroup_0(), "rule__MappingLoopCS__Group_0__0");
 					put(grammarAccess.getMappingLoopCSAccess().getGroup_0_2(), "rule__MappingLoopCS__Group_0_2__0");
@@ -137,8 +144,6 @@ public class QVTimperativeParser extends AbstractContentAssistParser {
 					put(grammarAccess.getNewStatementCSAccess().getGroup_0(), "rule__NewStatementCS__Group_0__0");
 					put(grammarAccess.getNewStatementCSAccess().getGroup_0_2(), "rule__NewStatementCS__Group_0_2__0");
 					put(grammarAccess.getNewStatementCSAccess().getGroup_7(), "rule__NewStatementCS__Group_7__0");
-					put(grammarAccess.getOutVariableCSAccess().getGroup(), "rule__OutVariableCS__Group__0");
-					put(grammarAccess.getOutVariableCSAccess().getGroup_4(), "rule__OutVariableCS__Group_4__0");
 					put(grammarAccess.getParamDeclarationCSAccess().getGroup(), "rule__ParamDeclarationCS__Group__0");
 					put(grammarAccess.getQualifiedPackageCSAccess().getGroup(), "rule__QualifiedPackageCS__Group__0");
 					put(grammarAccess.getQualifiedPackageCSAccess().getGroup_3(), "rule__QualifiedPackageCS__Group_3__0");
@@ -153,6 +158,8 @@ public class QVTimperativeParser extends AbstractContentAssistParser {
 					put(grammarAccess.getSetStatementCSAccess().getGroup(), "rule__SetStatementCS__Group__0");
 					put(grammarAccess.getSetStatementCSAccess().getGroup_0(), "rule__SetStatementCS__Group_0__0");
 					put(grammarAccess.getSetStatementCSAccess().getGroup_0_2(), "rule__SetStatementCS__Group_0_2__0");
+					put(grammarAccess.getSimpleParameterBindingCSAccess().getGroup(), "rule__SimpleParameterBindingCS__Group__0");
+					put(grammarAccess.getSimpleParameterCSAccess().getGroup(), "rule__SimpleParameterCS__Group__0");
 					put(grammarAccess.getTransformationCSAccess().getGroup(), "rule__TransformationCS__Group__0");
 					put(grammarAccess.getTransformationCSAccess().getGroup_4(), "rule__TransformationCS__Group_4__0");
 					put(grammarAccess.getAttributeCSAccess().getGroup(), "rule__AttributeCS__Group__0");
@@ -316,12 +323,17 @@ public class QVTimperativeParser extends AbstractContentAssistParser {
 					put(grammarAccess.getAddStatementCSAccess().getObservedPropertiesAssignment_0_2_1(), "rule__AddStatementCS__ObservedPropertiesAssignment_0_2_1");
 					put(grammarAccess.getAddStatementCSAccess().getTargetVariableAssignment_2(), "rule__AddStatementCS__TargetVariableAssignment_2");
 					put(grammarAccess.getAddStatementCSAccess().getOwnedExpressionAssignment_4(), "rule__AddStatementCS__OwnedExpressionAssignment_4");
+					put(grammarAccess.getAppendParameterBindingCSAccess().getReferredVariableAssignment_0(), "rule__AppendParameterBindingCS__ReferredVariableAssignment_0");
+					put(grammarAccess.getAppendParameterBindingCSAccess().getValueAssignment_2(), "rule__AppendParameterBindingCS__ValueAssignment_2");
 					put(grammarAccess.getAppendParameterCSAccess().getNameAssignment_1(), "rule__AppendParameterCS__NameAssignment_1");
 					put(grammarAccess.getAppendParameterCSAccess().getOwnedTypeAssignment_3(), "rule__AppendParameterCS__OwnedTypeAssignment_3");
+					put(grammarAccess.getBufferStatementCSAccess().getNameAssignment_1(), "rule__BufferStatementCS__NameAssignment_1");
+					put(grammarAccess.getBufferStatementCSAccess().getOwnedTypeAssignment_2_1(), "rule__BufferStatementCS__OwnedTypeAssignment_2_1");
+					put(grammarAccess.getBufferStatementCSAccess().getOwnedExpressionAssignment_3_1(), "rule__BufferStatementCS__OwnedExpressionAssignment_3_1");
 					put(grammarAccess.getCheckStatementCSAccess().getOwnedConditionAssignment_1(), "rule__CheckStatementCS__OwnedConditionAssignment_1");
 					put(grammarAccess.getDeclareStatementCSAccess().getObservedPropertiesAssignment_0_1(), "rule__DeclareStatementCS__ObservedPropertiesAssignment_0_1");
 					put(grammarAccess.getDeclareStatementCSAccess().getObservedPropertiesAssignment_0_2_1(), "rule__DeclareStatementCS__ObservedPropertiesAssignment_0_2_1");
-					put(grammarAccess.getDeclareStatementCSAccess().getIsCheckedAssignment_1(), "rule__DeclareStatementCS__IsCheckedAssignment_1");
+					put(grammarAccess.getDeclareStatementCSAccess().getIsCheckAssignment_1(), "rule__DeclareStatementCS__IsCheckAssignment_1");
 					put(grammarAccess.getDeclareStatementCSAccess().getNameAssignment_3(), "rule__DeclareStatementCS__NameAssignment_3");
 					put(grammarAccess.getDeclareStatementCSAccess().getOwnedTypeAssignment_4_1(), "rule__DeclareStatementCS__OwnedTypeAssignment_4_1");
 					put(grammarAccess.getDeclareStatementCSAccess().getOwnedExpressionAssignment_6(), "rule__DeclareStatementCS__OwnedExpressionAssignment_6");
@@ -330,12 +342,18 @@ public class QVTimperativeParser extends AbstractContentAssistParser {
 					put(grammarAccess.getDirectionCSAccess().getNameAssignment_2(), "rule__DirectionCS__NameAssignment_2");
 					put(grammarAccess.getDirectionCSAccess().getImportsAssignment_4(), "rule__DirectionCS__ImportsAssignment_4");
 					put(grammarAccess.getDirectionCSAccess().getImportsAssignment_5_1(), "rule__DirectionCS__ImportsAssignment_5_1");
+					put(grammarAccess.getGuardParameterBindingCSAccess().getIsCheckAssignment_0(), "rule__GuardParameterBindingCS__IsCheckAssignment_0");
+					put(grammarAccess.getGuardParameterBindingCSAccess().getReferredVariableAssignment_1(), "rule__GuardParameterBindingCS__ReferredVariableAssignment_1");
+					put(grammarAccess.getGuardParameterBindingCSAccess().getValueAssignment_3(), "rule__GuardParameterBindingCS__ValueAssignment_3");
 					put(grammarAccess.getGuardParameterCSAccess().getReferredTypedModelAssignment_2(), "rule__GuardParameterCS__ReferredTypedModelAssignment_2");
 					put(grammarAccess.getGuardParameterCSAccess().getNameAssignment_3(), "rule__GuardParameterCS__NameAssignment_3");
 					put(grammarAccess.getGuardParameterCSAccess().getOwnedTypeAssignment_5(), "rule__GuardParameterCS__OwnedTypeAssignment_5");
 					put(grammarAccess.getImportCSAccess().getNameAssignment_1_0(), "rule__ImportCS__NameAssignment_1_0");
 					put(grammarAccess.getImportCSAccess().getOwnedPathNameAssignment_2(), "rule__ImportCS__OwnedPathNameAssignment_2");
 					put(grammarAccess.getImportCSAccess().getIsAllAssignment_3_0(), "rule__ImportCS__IsAllAssignment_3_0");
+					put(grammarAccess.getLoopParameterBindingCSAccess().getIsCheckAssignment_0(), "rule__LoopParameterBindingCS__IsCheckAssignment_0");
+					put(grammarAccess.getLoopParameterBindingCSAccess().getReferredVariableAssignment_1(), "rule__LoopParameterBindingCS__ReferredVariableAssignment_1");
+					put(grammarAccess.getLoopParameterBindingCSAccess().getValueAssignment_3(), "rule__LoopParameterBindingCS__ValueAssignment_3");
 					put(grammarAccess.getMappingCSAccess().getNameAssignment_2(), "rule__MappingCS__NameAssignment_2");
 					put(grammarAccess.getMappingCSAccess().getOwnedInPathNameAssignment_3_1(), "rule__MappingCS__OwnedInPathNameAssignment_3_1");
 					put(grammarAccess.getMappingCSAccess().getOwnedParametersAssignment_5(), "rule__MappingCS__OwnedParametersAssignment_5");
@@ -343,10 +361,10 @@ public class QVTimperativeParser extends AbstractContentAssistParser {
 					put(grammarAccess.getMappingCSAccess().getOwnedStatementsAssignment_7(), "rule__MappingCS__OwnedStatementsAssignment_7");
 					put(grammarAccess.getMappingCSAccess().getOwnedStatementsAssignment_8(), "rule__MappingCS__OwnedStatementsAssignment_8");
 					put(grammarAccess.getMappingCallCSAccess().getIsInfiniteAssignment_1(), "rule__MappingCallCS__IsInfiniteAssignment_1");
+					put(grammarAccess.getMappingCallCSAccess().getIsInstallAssignment_2_1(), "rule__MappingCallCS__IsInstallAssignment_2_1");
+					put(grammarAccess.getMappingCallCSAccess().getIsInvokeAssignment_2_2(), "rule__MappingCallCS__IsInvokeAssignment_2_2");
 					put(grammarAccess.getMappingCallCSAccess().getOwnedPathNameAssignment_3(), "rule__MappingCallCS__OwnedPathNameAssignment_3");
 					put(grammarAccess.getMappingCallCSAccess().getOwnedBindingsAssignment_5(), "rule__MappingCallCS__OwnedBindingsAssignment_5");
-					put(grammarAccess.getMappingCallBindingCSAccess().getReferredVariableAssignment_0(), "rule__MappingCallBindingCS__ReferredVariableAssignment_0");
-					put(grammarAccess.getMappingCallBindingCSAccess().getOwnedValueAssignment_2(), "rule__MappingCallBindingCS__OwnedValueAssignment_2");
 					put(grammarAccess.getMappingLoopCSAccess().getObservedPropertiesAssignment_0_1(), "rule__MappingLoopCS__ObservedPropertiesAssignment_0_1");
 					put(grammarAccess.getMappingLoopCSAccess().getObservedPropertiesAssignment_0_2_1(), "rule__MappingLoopCS__ObservedPropertiesAssignment_0_2_1");
 					put(grammarAccess.getMappingLoopCSAccess().getOwnedIteratorAssignment_2(), "rule__MappingLoopCS__OwnedIteratorAssignment_2");
@@ -360,9 +378,6 @@ public class QVTimperativeParser extends AbstractContentAssistParser {
 					put(grammarAccess.getNewStatementCSAccess().getNameAssignment_4(), "rule__NewStatementCS__NameAssignment_4");
 					put(grammarAccess.getNewStatementCSAccess().getOwnedTypeAssignment_6(), "rule__NewStatementCS__OwnedTypeAssignment_6");
 					put(grammarAccess.getNewStatementCSAccess().getOwnedExpressionAssignment_7_1(), "rule__NewStatementCS__OwnedExpressionAssignment_7_1");
-					put(grammarAccess.getOutVariableCSAccess().getNameAssignment_1(), "rule__OutVariableCS__NameAssignment_1");
-					put(grammarAccess.getOutVariableCSAccess().getOwnedTypeAssignment_3(), "rule__OutVariableCS__OwnedTypeAssignment_3");
-					put(grammarAccess.getOutVariableCSAccess().getOwnedExpressionAssignment_4_1(), "rule__OutVariableCS__OwnedExpressionAssignment_4_1");
 					put(grammarAccess.getParamDeclarationCSAccess().getNameAssignment_0(), "rule__ParamDeclarationCS__NameAssignment_0");
 					put(grammarAccess.getParamDeclarationCSAccess().getOwnedTypeAssignment_2(), "rule__ParamDeclarationCS__OwnedTypeAssignment_2");
 					put(grammarAccess.getQualifiedPackageCSAccess().getOwnedPathNameAssignment_1(), "rule__QualifiedPackageCS__OwnedPathNameAssignment_1");
@@ -386,6 +401,12 @@ public class QVTimperativeParser extends AbstractContentAssistParser {
 					put(grammarAccess.getSetStatementCSAccess().getReferredVariableAssignment_3(), "rule__SetStatementCS__ReferredVariableAssignment_3");
 					put(grammarAccess.getSetStatementCSAccess().getReferredPropertyAssignment_5(), "rule__SetStatementCS__ReferredPropertyAssignment_5");
 					put(grammarAccess.getSetStatementCSAccess().getOwnedExpressionAssignment_7(), "rule__SetStatementCS__OwnedExpressionAssignment_7");
+					put(grammarAccess.getSimpleParameterBindingCSAccess().getIsCheckAssignment_0(), "rule__SimpleParameterBindingCS__IsCheckAssignment_0");
+					put(grammarAccess.getSimpleParameterBindingCSAccess().getReferredVariableAssignment_1(), "rule__SimpleParameterBindingCS__ReferredVariableAssignment_1");
+					put(grammarAccess.getSimpleParameterBindingCSAccess().getOwnedValueAssignment_3(), "rule__SimpleParameterBindingCS__OwnedValueAssignment_3");
+					put(grammarAccess.getSimpleParameterCSAccess().getReferredTypedModelAssignment_2(), "rule__SimpleParameterCS__ReferredTypedModelAssignment_2");
+					put(grammarAccess.getSimpleParameterCSAccess().getNameAssignment_3(), "rule__SimpleParameterCS__NameAssignment_3");
+					put(grammarAccess.getSimpleParameterCSAccess().getOwnedTypeAssignment_5(), "rule__SimpleParameterCS__OwnedTypeAssignment_5");
 					put(grammarAccess.getTransformationCSAccess().getOwnedPathNameAssignment_1(), "rule__TransformationCS__OwnedPathNameAssignment_1");
 					put(grammarAccess.getTransformationCSAccess().getNameAssignment_2(), "rule__TransformationCS__NameAssignment_2");
 					put(grammarAccess.getTransformationCSAccess().getOwnedDirectionsAssignment_4_0(), "rule__TransformationCS__OwnedDirectionsAssignment_4_0");
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperative.g b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperative.g
index 03dd07a8f..0b3a734d7 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperative.g
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperative.g
@@ -120,6 +120,34 @@ finally {
 
 
 
+// Entry rule entryRuleAppendParameterBindingCS
+entryRuleAppendParameterBindingCS 
+:
+{ before(grammarAccess.getAppendParameterBindingCSRule()); }
+	 ruleAppendParameterBindingCS
+{ after(grammarAccess.getAppendParameterBindingCSRule()); } 
+	 EOF 
+;
+
+// Rule AppendParameterBindingCS
+ruleAppendParameterBindingCS
+    @init {
+		int stackSize = keepStackSize();
+    }
+	:
+(
+{ before(grammarAccess.getAppendParameterBindingCSAccess().getGroup()); }
+(rule__AppendParameterBindingCS__Group__0)
+{ after(grammarAccess.getAppendParameterBindingCSAccess().getGroup()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
 // Entry rule entryRuleAppendParameterCS
 entryRuleAppendParameterCS 
 :
@@ -148,6 +176,34 @@ finally {
 
 
 
+// Entry rule entryRuleBufferStatementCS
+entryRuleBufferStatementCS 
+:
+{ before(grammarAccess.getBufferStatementCSRule()); }
+	 ruleBufferStatementCS
+{ after(grammarAccess.getBufferStatementCSRule()); } 
+	 EOF 
+;
+
+// Rule BufferStatementCS
+ruleBufferStatementCS
+    @init {
+		int stackSize = keepStackSize();
+    }
+	:
+(
+{ before(grammarAccess.getBufferStatementCSAccess().getGroup()); }
+(rule__BufferStatementCS__Group__0)
+{ after(grammarAccess.getBufferStatementCSAccess().getGroup()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
 // Entry rule entryRuleCommitStatementCS
 entryRuleCommitStatementCS 
 :
@@ -288,6 +344,34 @@ finally {
 
 
 
+// Entry rule entryRuleGuardParameterBindingCS
+entryRuleGuardParameterBindingCS 
+:
+{ before(grammarAccess.getGuardParameterBindingCSRule()); }
+	 ruleGuardParameterBindingCS
+{ after(grammarAccess.getGuardParameterBindingCSRule()); } 
+	 EOF 
+;
+
+// Rule GuardParameterBindingCS
+ruleGuardParameterBindingCS
+    @init {
+		int stackSize = keepStackSize();
+    }
+	:
+(
+{ before(grammarAccess.getGuardParameterBindingCSAccess().getGroup()); }
+(rule__GuardParameterBindingCS__Group__0)
+{ after(grammarAccess.getGuardParameterBindingCSAccess().getGroup()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
 // Entry rule entryRuleGuardParameterCS
 entryRuleGuardParameterCS 
 :
@@ -372,6 +456,34 @@ finally {
 
 
 
+// Entry rule entryRuleLoopParameterBindingCS
+entryRuleLoopParameterBindingCS 
+:
+{ before(grammarAccess.getLoopParameterBindingCSRule()); }
+	 ruleLoopParameterBindingCS
+{ after(grammarAccess.getLoopParameterBindingCSRule()); } 
+	 EOF 
+;
+
+// Rule LoopParameterBindingCS
+ruleLoopParameterBindingCS
+    @init {
+		int stackSize = keepStackSize();
+    }
+	:
+(
+{ before(grammarAccess.getLoopParameterBindingCSAccess().getGroup()); }
+(rule__LoopParameterBindingCS__Group__0)
+{ after(grammarAccess.getLoopParameterBindingCSAccess().getGroup()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
 // Entry rule entryRuleMappingCS
 entryRuleMappingCS 
 :
@@ -428,34 +540,6 @@ finally {
 
 
 
-// Entry rule entryRuleMappingCallBindingCS
-entryRuleMappingCallBindingCS 
-:
-{ before(grammarAccess.getMappingCallBindingCSRule()); }
-	 ruleMappingCallBindingCS
-{ after(grammarAccess.getMappingCallBindingCSRule()); } 
-	 EOF 
-;
-
-// Rule MappingCallBindingCS
-ruleMappingCallBindingCS
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getMappingCallBindingCSAccess().getGroup()); }
-(rule__MappingCallBindingCS__Group__0)
-{ after(grammarAccess.getMappingCallBindingCSAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
 // Entry rule entryRuleMappingLoopCS
 entryRuleMappingLoopCS 
 :
@@ -512,6 +596,34 @@ finally {
 
 
 
+// Entry rule entryRuleMappingParameterBindingCS
+entryRuleMappingParameterBindingCS 
+:
+{ before(grammarAccess.getMappingParameterBindingCSRule()); }
+	 ruleMappingParameterBindingCS
+{ after(grammarAccess.getMappingParameterBindingCSRule()); } 
+	 EOF 
+;
+
+// Rule MappingParameterBindingCS
+ruleMappingParameterBindingCS
+    @init {
+		int stackSize = keepStackSize();
+    }
+	:
+(
+{ before(grammarAccess.getMappingParameterBindingCSAccess().getAlternatives()); }
+(rule__MappingParameterBindingCS__Alternatives)
+{ after(grammarAccess.getMappingParameterBindingCSAccess().getAlternatives()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
 // Entry rule entryRuleMappingParameterCS
 entryRuleMappingParameterCS 
 :
@@ -568,34 +680,6 @@ finally {
 
 
 
-// Entry rule entryRuleOutVariableCS
-entryRuleOutVariableCS 
-:
-{ before(grammarAccess.getOutVariableCSRule()); }
-	 ruleOutVariableCS
-{ after(grammarAccess.getOutVariableCSRule()); } 
-	 EOF 
-;
-
-// Rule OutVariableCS
-ruleOutVariableCS
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getOutVariableCSAccess().getGroup()); }
-(rule__OutVariableCS__Group__0)
-{ after(grammarAccess.getOutVariableCSAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
 // Entry rule entryRuleParamDeclarationCS
 entryRuleParamDeclarationCS 
 :
@@ -736,6 +820,62 @@ finally {
 
 
 
+// Entry rule entryRuleSimpleParameterBindingCS
+entryRuleSimpleParameterBindingCS 
+:
+{ before(grammarAccess.getSimpleParameterBindingCSRule()); }
+	 ruleSimpleParameterBindingCS
+{ after(grammarAccess.getSimpleParameterBindingCSRule()); } 
+	 EOF 
+;
+
+// Rule SimpleParameterBindingCS
+ruleSimpleParameterBindingCS
+    @init {
+		int stackSize = keepStackSize();
+    }
+	:
+(
+{ before(grammarAccess.getSimpleParameterBindingCSAccess().getGroup()); }
+(rule__SimpleParameterBindingCS__Group__0)
+{ after(grammarAccess.getSimpleParameterBindingCSAccess().getGroup()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+// Entry rule entryRuleSimpleParameterCS
+entryRuleSimpleParameterCS 
+:
+{ before(grammarAccess.getSimpleParameterCSRule()); }
+	 ruleSimpleParameterCS
+{ after(grammarAccess.getSimpleParameterCSRule()); } 
+	 EOF 
+;
+
+// Rule SimpleParameterCS
+ruleSimpleParameterCS
+    @init {
+		int stackSize = keepStackSize();
+    }
+	:
+(
+{ before(grammarAccess.getSimpleParameterCSAccess().getGroup()); }
+(rule__SimpleParameterCS__Group__0)
+{ after(grammarAccess.getSimpleParameterCSAccess().getGroup()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
 // Entry rule entryRuleTransformationCS
 entryRuleTransformationCS 
 :
@@ -3576,9 +3716,9 @@ rule__GuardStatementCS__Alternatives
     }
 :
 (
-{ before(grammarAccess.getGuardStatementCSAccess().getOutVariableCSParserRuleCall_0()); }
-	ruleOutVariableCS
-{ after(grammarAccess.getGuardStatementCSAccess().getOutVariableCSParserRuleCall_0()); }
+{ before(grammarAccess.getGuardStatementCSAccess().getBufferStatementCSParserRuleCall_0()); }
+	ruleBufferStatementCS
+{ after(grammarAccess.getGuardStatementCSAccess().getBufferStatementCSParserRuleCall_0()); }
 )
 
     |(
@@ -3604,21 +3744,91 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+rule__MappingCallCS__Alternatives_2
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getMappingCallCSAccess().getCallKeyword_2_0()); }
+
+	'call' 
+
+{ after(grammarAccess.getMappingCallCSAccess().getCallKeyword_2_0()); }
+)
+
+    |(
+{ before(grammarAccess.getMappingCallCSAccess().getIsInstallAssignment_2_1()); }
+(rule__MappingCallCS__IsInstallAssignment_2_1)
+{ after(grammarAccess.getMappingCallCSAccess().getIsInstallAssignment_2_1()); }
+)
+
+    |(
+{ before(grammarAccess.getMappingCallCSAccess().getIsInvokeAssignment_2_2()); }
+(rule__MappingCallCS__IsInvokeAssignment_2_2)
+{ after(grammarAccess.getMappingCallCSAccess().getIsInvokeAssignment_2_2()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__MappingParameterBindingCS__Alternatives
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getMappingParameterBindingCSAccess().getAppendParameterBindingCSParserRuleCall_0()); }
+	ruleAppendParameterBindingCS
+{ after(grammarAccess.getMappingParameterBindingCSAccess().getAppendParameterBindingCSParserRuleCall_0()); }
+)
+
+    |(
+{ before(grammarAccess.getMappingParameterBindingCSAccess().getGuardParameterBindingCSParserRuleCall_1()); }
+	ruleGuardParameterBindingCS
+{ after(grammarAccess.getMappingParameterBindingCSAccess().getGuardParameterBindingCSParserRuleCall_1()); }
+)
+
+    |(
+{ before(grammarAccess.getMappingParameterBindingCSAccess().getLoopParameterBindingCSParserRuleCall_2()); }
+	ruleLoopParameterBindingCS
+{ after(grammarAccess.getMappingParameterBindingCSAccess().getLoopParameterBindingCSParserRuleCall_2()); }
+)
+
+    |(
+{ before(grammarAccess.getMappingParameterBindingCSAccess().getSimpleParameterBindingCSParserRuleCall_3()); }
+	ruleSimpleParameterBindingCS
+{ after(grammarAccess.getMappingParameterBindingCSAccess().getSimpleParameterBindingCSParserRuleCall_3()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 rule__MappingParameterCS__Alternatives
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMappingParameterCSAccess().getGuardParameterCSParserRuleCall_0()); }
+{ before(grammarAccess.getMappingParameterCSAccess().getAppendParameterCSParserRuleCall_0()); }
+	ruleAppendParameterCS
+{ after(grammarAccess.getMappingParameterCSAccess().getAppendParameterCSParserRuleCall_0()); }
+)
+
+    |(
+{ before(grammarAccess.getMappingParameterCSAccess().getGuardParameterCSParserRuleCall_1()); }
 	ruleGuardParameterCS
-{ after(grammarAccess.getMappingParameterCSAccess().getGuardParameterCSParserRuleCall_0()); }
+{ after(grammarAccess.getMappingParameterCSAccess().getGuardParameterCSParserRuleCall_1()); }
 )
 
     |(
-{ before(grammarAccess.getMappingParameterCSAccess().getAppendParameterCSParserRuleCall_1()); }
-	ruleAppendParameterCS
-{ after(grammarAccess.getMappingParameterCSAccess().getAppendParameterCSParserRuleCall_1()); }
+{ before(grammarAccess.getMappingParameterCSAccess().getSimpleParameterCSParserRuleCall_2()); }
+	ruleSimpleParameterCS
+{ after(grammarAccess.getMappingParameterCSAccess().getSimpleParameterCSParserRuleCall_2()); }
 )
 
 ;
@@ -5950,6 +6160,133 @@ finally {
 
 
 
+rule__AppendParameterBindingCS__Group__0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__AppendParameterBindingCS__Group__0__Impl
+	rule__AppendParameterBindingCS__Group__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__AppendParameterBindingCS__Group__0__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getAppendParameterBindingCSAccess().getReferredVariableAssignment_0()); }
+(rule__AppendParameterBindingCS__ReferredVariableAssignment_0)
+{ after(grammarAccess.getAppendParameterBindingCSAccess().getReferredVariableAssignment_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__AppendParameterBindingCS__Group__1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__AppendParameterBindingCS__Group__1__Impl
+	rule__AppendParameterBindingCS__Group__2
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__AppendParameterBindingCS__Group__1__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getAppendParameterBindingCSAccess().getAppendsToKeyword_1()); }
+
+	'appendsTo' 
+
+{ after(grammarAccess.getAppendParameterBindingCSAccess().getAppendsToKeyword_1()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__AppendParameterBindingCS__Group__2
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__AppendParameterBindingCS__Group__2__Impl
+	rule__AppendParameterBindingCS__Group__3
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__AppendParameterBindingCS__Group__2__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getAppendParameterBindingCSAccess().getValueAssignment_2()); }
+(rule__AppendParameterBindingCS__ValueAssignment_2)
+{ after(grammarAccess.getAppendParameterBindingCSAccess().getValueAssignment_2()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__AppendParameterBindingCS__Group__3
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__AppendParameterBindingCS__Group__3__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__AppendParameterBindingCS__Group__3__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getAppendParameterBindingCSAccess().getSemicolonKeyword_3()); }
+
+	';' 
+
+{ after(grammarAccess.getAppendParameterBindingCSAccess().getSemicolonKeyword_3()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+
+
+
+
+
+
+
 rule__AppendParameterCS__Group__0
     @init {
 		int stackSize = keepStackSize();
@@ -6110,6 +6447,290 @@ finally {
 
 
 
+rule__BufferStatementCS__Group__0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__BufferStatementCS__Group__0__Impl
+	rule__BufferStatementCS__Group__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__BufferStatementCS__Group__0__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getBufferStatementCSAccess().getBufferKeyword_0()); }
+
+	'buffer' 
+
+{ after(grammarAccess.getBufferStatementCSAccess().getBufferKeyword_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__BufferStatementCS__Group__1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__BufferStatementCS__Group__1__Impl
+	rule__BufferStatementCS__Group__2
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__BufferStatementCS__Group__1__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getBufferStatementCSAccess().getNameAssignment_1()); }
+(rule__BufferStatementCS__NameAssignment_1)
+{ after(grammarAccess.getBufferStatementCSAccess().getNameAssignment_1()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__BufferStatementCS__Group__2
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__BufferStatementCS__Group__2__Impl
+	rule__BufferStatementCS__Group__3
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__BufferStatementCS__Group__2__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getBufferStatementCSAccess().getGroup_2()); }
+(rule__BufferStatementCS__Group_2__0)?
+{ after(grammarAccess.getBufferStatementCSAccess().getGroup_2()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__BufferStatementCS__Group__3
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__BufferStatementCS__Group__3__Impl
+	rule__BufferStatementCS__Group__4
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__BufferStatementCS__Group__3__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getBufferStatementCSAccess().getGroup_3()); }
+(rule__BufferStatementCS__Group_3__0)?
+{ after(grammarAccess.getBufferStatementCSAccess().getGroup_3()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__BufferStatementCS__Group__4
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__BufferStatementCS__Group__4__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__BufferStatementCS__Group__4__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getBufferStatementCSAccess().getSemicolonKeyword_4()); }
+
+	';' 
+
+{ after(grammarAccess.getBufferStatementCSAccess().getSemicolonKeyword_4()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+rule__BufferStatementCS__Group_2__0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__BufferStatementCS__Group_2__0__Impl
+	rule__BufferStatementCS__Group_2__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__BufferStatementCS__Group_2__0__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getBufferStatementCSAccess().getColonKeyword_2_0()); }
+
+	':' 
+
+{ after(grammarAccess.getBufferStatementCSAccess().getColonKeyword_2_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__BufferStatementCS__Group_2__1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__BufferStatementCS__Group_2__1__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__BufferStatementCS__Group_2__1__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getBufferStatementCSAccess().getOwnedTypeAssignment_2_1()); }
+(rule__BufferStatementCS__OwnedTypeAssignment_2_1)
+{ after(grammarAccess.getBufferStatementCSAccess().getOwnedTypeAssignment_2_1()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+
+
+
+rule__BufferStatementCS__Group_3__0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__BufferStatementCS__Group_3__0__Impl
+	rule__BufferStatementCS__Group_3__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__BufferStatementCS__Group_3__0__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getBufferStatementCSAccess().getColonEqualsSignKeyword_3_0()); }
+
+	':=' 
+
+{ after(grammarAccess.getBufferStatementCSAccess().getColonEqualsSignKeyword_3_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__BufferStatementCS__Group_3__1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__BufferStatementCS__Group_3__1__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__BufferStatementCS__Group_3__1__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getBufferStatementCSAccess().getOwnedExpressionAssignment_3_1()); }
+(rule__BufferStatementCS__OwnedExpressionAssignment_3_1)
+{ after(grammarAccess.getBufferStatementCSAccess().getOwnedExpressionAssignment_3_1()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+
+
+
 rule__CheckStatementCS__Group__0
     @init {
 		int stackSize = keepStackSize();
@@ -6253,9 +6874,9 @@ rule__DeclareStatementCS__Group__1__Impl
     }
 :
 (
-{ before(grammarAccess.getDeclareStatementCSAccess().getIsCheckedAssignment_1()); }
-(rule__DeclareStatementCS__IsCheckedAssignment_1)?
-{ after(grammarAccess.getDeclareStatementCSAccess().getIsCheckedAssignment_1()); }
+{ before(grammarAccess.getDeclareStatementCSAccess().getIsCheckAssignment_1()); }
+(rule__DeclareStatementCS__IsCheckAssignment_1)?
+{ after(grammarAccess.getDeclareStatementCSAccess().getIsCheckAssignment_1()); }
 )
 
 ;
@@ -6931,6 +7552,164 @@ finally {
 
 
 
+rule__GuardParameterBindingCS__Group__0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__GuardParameterBindingCS__Group__0__Impl
+	rule__GuardParameterBindingCS__Group__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__GuardParameterBindingCS__Group__0__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getGuardParameterBindingCSAccess().getIsCheckAssignment_0()); }
+(rule__GuardParameterBindingCS__IsCheckAssignment_0)?
+{ after(grammarAccess.getGuardParameterBindingCSAccess().getIsCheckAssignment_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__GuardParameterBindingCS__Group__1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__GuardParameterBindingCS__Group__1__Impl
+	rule__GuardParameterBindingCS__Group__2
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__GuardParameterBindingCS__Group__1__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getGuardParameterBindingCSAccess().getReferredVariableAssignment_1()); }
+(rule__GuardParameterBindingCS__ReferredVariableAssignment_1)
+{ after(grammarAccess.getGuardParameterBindingCSAccess().getReferredVariableAssignment_1()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__GuardParameterBindingCS__Group__2
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__GuardParameterBindingCS__Group__2__Impl
+	rule__GuardParameterBindingCS__Group__3
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__GuardParameterBindingCS__Group__2__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getGuardParameterBindingCSAccess().getConsumesKeyword_2()); }
+
+	'consumes' 
+
+{ after(grammarAccess.getGuardParameterBindingCSAccess().getConsumesKeyword_2()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__GuardParameterBindingCS__Group__3
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__GuardParameterBindingCS__Group__3__Impl
+	rule__GuardParameterBindingCS__Group__4
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__GuardParameterBindingCS__Group__3__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getGuardParameterBindingCSAccess().getValueAssignment_3()); }
+(rule__GuardParameterBindingCS__ValueAssignment_3)
+{ after(grammarAccess.getGuardParameterBindingCSAccess().getValueAssignment_3()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__GuardParameterBindingCS__Group__4
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__GuardParameterBindingCS__Group__4__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__GuardParameterBindingCS__Group__4__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getGuardParameterBindingCSAccess().getSemicolonKeyword_4()); }
+
+	';' 
+
+{ after(grammarAccess.getGuardParameterBindingCSAccess().getSemicolonKeyword_4()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+
+
+
+
+
+
+
+
+
 rule__GuardParameterCS__Group__0
     @init {
 		int stackSize = keepStackSize();
@@ -6949,11 +7728,11 @@ rule__GuardParameterCS__Group__0__Impl
     }
 :
 (
-{ before(grammarAccess.getGuardParameterCSAccess().getInKeyword_0()); }
+{ before(grammarAccess.getGuardParameterCSAccess().getGuardKeyword_0()); }
 
-	'in' 
+	'guard' 
 
-{ after(grammarAccess.getGuardParameterCSAccess().getInKeyword_0()); }
+{ after(grammarAccess.getGuardParameterCSAccess().getGuardKeyword_0()); }
 )
 
 ;
@@ -7439,6 +8218,164 @@ finally {
 
 
 
+rule__LoopParameterBindingCS__Group__0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__LoopParameterBindingCS__Group__0__Impl
+	rule__LoopParameterBindingCS__Group__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__LoopParameterBindingCS__Group__0__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getLoopParameterBindingCSAccess().getIsCheckAssignment_0()); }
+(rule__LoopParameterBindingCS__IsCheckAssignment_0)?
+{ after(grammarAccess.getLoopParameterBindingCSAccess().getIsCheckAssignment_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__LoopParameterBindingCS__Group__1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__LoopParameterBindingCS__Group__1__Impl
+	rule__LoopParameterBindingCS__Group__2
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__LoopParameterBindingCS__Group__1__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getLoopParameterBindingCSAccess().getReferredVariableAssignment_1()); }
+(rule__LoopParameterBindingCS__ReferredVariableAssignment_1)
+{ after(grammarAccess.getLoopParameterBindingCSAccess().getReferredVariableAssignment_1()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__LoopParameterBindingCS__Group__2
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__LoopParameterBindingCS__Group__2__Impl
+	rule__LoopParameterBindingCS__Group__3
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__LoopParameterBindingCS__Group__2__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getLoopParameterBindingCSAccess().getIteratesKeyword_2()); }
+
+	'iterates' 
+
+{ after(grammarAccess.getLoopParameterBindingCSAccess().getIteratesKeyword_2()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__LoopParameterBindingCS__Group__3
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__LoopParameterBindingCS__Group__3__Impl
+	rule__LoopParameterBindingCS__Group__4
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__LoopParameterBindingCS__Group__3__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getLoopParameterBindingCSAccess().getValueAssignment_3()); }
+(rule__LoopParameterBindingCS__ValueAssignment_3)
+{ after(grammarAccess.getLoopParameterBindingCSAccess().getValueAssignment_3()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__LoopParameterBindingCS__Group__4
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__LoopParameterBindingCS__Group__4__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__LoopParameterBindingCS__Group__4__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getLoopParameterBindingCSAccess().getSemicolonKeyword_4()); }
+
+	';' 
+
+{ after(grammarAccess.getLoopParameterBindingCSAccess().getSemicolonKeyword_4()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+
+
+
+
+
+
+
+
+
 rule__MappingCS__Group__0
     @init {
 		int stackSize = keepStackSize();
@@ -7897,11 +8834,9 @@ rule__MappingCallCS__Group__2__Impl
     }
 :
 (
-{ before(grammarAccess.getMappingCallCSAccess().getCallKeyword_2()); }
-
-	'call' 
-
-{ after(grammarAccess.getMappingCallCSAccess().getCallKeyword_2()); }
+{ before(grammarAccess.getMappingCallCSAccess().getAlternatives_2()); }
+(rule__MappingCallCS__Alternatives_2)
+{ after(grammarAccess.getMappingCallCSAccess().getAlternatives_2()); }
 )
 
 ;
@@ -8043,133 +8978,6 @@ finally {
 
 
 
-rule__MappingCallBindingCS__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__MappingCallBindingCS__Group__0__Impl
-	rule__MappingCallBindingCS__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__MappingCallBindingCS__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMappingCallBindingCSAccess().getReferredVariableAssignment_0()); }
-(rule__MappingCallBindingCS__ReferredVariableAssignment_0)
-{ after(grammarAccess.getMappingCallBindingCSAccess().getReferredVariableAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__MappingCallBindingCS__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__MappingCallBindingCS__Group__1__Impl
-	rule__MappingCallBindingCS__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__MappingCallBindingCS__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMappingCallBindingCSAccess().getColonEqualsSignKeyword_1()); }
-
-	':=' 
-
-{ after(grammarAccess.getMappingCallBindingCSAccess().getColonEqualsSignKeyword_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__MappingCallBindingCS__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__MappingCallBindingCS__Group__2__Impl
-	rule__MappingCallBindingCS__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__MappingCallBindingCS__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMappingCallBindingCSAccess().getOwnedValueAssignment_2()); }
-(rule__MappingCallBindingCS__OwnedValueAssignment_2)
-{ after(grammarAccess.getMappingCallBindingCSAccess().getOwnedValueAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__MappingCallBindingCS__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__MappingCallBindingCS__Group__3__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__MappingCallBindingCS__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMappingCallBindingCSAccess().getSemicolonKeyword_3()); }
-
-	';' 
-
-{ after(grammarAccess.getMappingCallBindingCSAccess().getSemicolonKeyword_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
 rule__MappingLoopCS__Group__0
     @init {
 		int stackSize = keepStackSize();
@@ -9219,260 +10027,6 @@ finally {
 
 
 
-rule__OutVariableCS__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutVariableCS__Group__0__Impl
-	rule__OutVariableCS__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutVariableCS__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutVariableCSAccess().getOutKeyword_0()); }
-
-	'out' 
-
-{ after(grammarAccess.getOutVariableCSAccess().getOutKeyword_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__OutVariableCS__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutVariableCS__Group__1__Impl
-	rule__OutVariableCS__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutVariableCS__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutVariableCSAccess().getNameAssignment_1()); }
-(rule__OutVariableCS__NameAssignment_1)
-{ after(grammarAccess.getOutVariableCSAccess().getNameAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__OutVariableCS__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutVariableCS__Group__2__Impl
-	rule__OutVariableCS__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutVariableCS__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutVariableCSAccess().getColonKeyword_2()); }
-
-	':' 
-
-{ after(grammarAccess.getOutVariableCSAccess().getColonKeyword_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__OutVariableCS__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutVariableCS__Group__3__Impl
-	rule__OutVariableCS__Group__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutVariableCS__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutVariableCSAccess().getOwnedTypeAssignment_3()); }
-(rule__OutVariableCS__OwnedTypeAssignment_3)
-{ after(grammarAccess.getOutVariableCSAccess().getOwnedTypeAssignment_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__OutVariableCS__Group__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutVariableCS__Group__4__Impl
-	rule__OutVariableCS__Group__5
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutVariableCS__Group__4__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutVariableCSAccess().getGroup_4()); }
-(rule__OutVariableCS__Group_4__0)?
-{ after(grammarAccess.getOutVariableCSAccess().getGroup_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__OutVariableCS__Group__5
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutVariableCS__Group__5__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutVariableCS__Group__5__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutVariableCSAccess().getSemicolonKeyword_5()); }
-
-	';' 
-
-{ after(grammarAccess.getOutVariableCSAccess().getSemicolonKeyword_5()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-rule__OutVariableCS__Group_4__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutVariableCS__Group_4__0__Impl
-	rule__OutVariableCS__Group_4__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutVariableCS__Group_4__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutVariableCSAccess().getColonEqualsSignKeyword_4_0()); }
-
-	':=' 
-
-{ after(grammarAccess.getOutVariableCSAccess().getColonEqualsSignKeyword_4_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__OutVariableCS__Group_4__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutVariableCS__Group_4__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutVariableCS__Group_4__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutVariableCSAccess().getOwnedExpressionAssignment_4_1()); }
-(rule__OutVariableCS__OwnedExpressionAssignment_4_1)
-{ after(grammarAccess.getOutVariableCSAccess().getOwnedExpressionAssignment_4_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
 rule__ParamDeclarationCS__Group__0
     @init {
 		int stackSize = keepStackSize();
@@ -11113,6 +11667,388 @@ finally {
 
 
 
+rule__SimpleParameterBindingCS__Group__0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__SimpleParameterBindingCS__Group__0__Impl
+	rule__SimpleParameterBindingCS__Group__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterBindingCS__Group__0__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterBindingCSAccess().getIsCheckAssignment_0()); }
+(rule__SimpleParameterBindingCS__IsCheckAssignment_0)?
+{ after(grammarAccess.getSimpleParameterBindingCSAccess().getIsCheckAssignment_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__SimpleParameterBindingCS__Group__1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__SimpleParameterBindingCS__Group__1__Impl
+	rule__SimpleParameterBindingCS__Group__2
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterBindingCS__Group__1__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterBindingCSAccess().getReferredVariableAssignment_1()); }
+(rule__SimpleParameterBindingCS__ReferredVariableAssignment_1)
+{ after(grammarAccess.getSimpleParameterBindingCSAccess().getReferredVariableAssignment_1()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__SimpleParameterBindingCS__Group__2
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__SimpleParameterBindingCS__Group__2__Impl
+	rule__SimpleParameterBindingCS__Group__3
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterBindingCS__Group__2__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterBindingCSAccess().getUsesKeyword_2()); }
+
+	'uses' 
+
+{ after(grammarAccess.getSimpleParameterBindingCSAccess().getUsesKeyword_2()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__SimpleParameterBindingCS__Group__3
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__SimpleParameterBindingCS__Group__3__Impl
+	rule__SimpleParameterBindingCS__Group__4
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterBindingCS__Group__3__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterBindingCSAccess().getOwnedValueAssignment_3()); }
+(rule__SimpleParameterBindingCS__OwnedValueAssignment_3)
+{ after(grammarAccess.getSimpleParameterBindingCSAccess().getOwnedValueAssignment_3()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__SimpleParameterBindingCS__Group__4
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__SimpleParameterBindingCS__Group__4__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterBindingCS__Group__4__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterBindingCSAccess().getSemicolonKeyword_4()); }
+
+	';' 
+
+{ after(grammarAccess.getSimpleParameterBindingCSAccess().getSemicolonKeyword_4()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+rule__SimpleParameterCS__Group__0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__SimpleParameterCS__Group__0__Impl
+	rule__SimpleParameterCS__Group__1
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterCS__Group__0__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterCSAccess().getInKeyword_0()); }
+
+	'in' 
+
+{ after(grammarAccess.getSimpleParameterCSAccess().getInKeyword_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__SimpleParameterCS__Group__1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__SimpleParameterCS__Group__1__Impl
+	rule__SimpleParameterCS__Group__2
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterCS__Group__1__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterCSAccess().getColonKeyword_1()); }
+
+	':' 
+
+{ after(grammarAccess.getSimpleParameterCSAccess().getColonKeyword_1()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__SimpleParameterCS__Group__2
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__SimpleParameterCS__Group__2__Impl
+	rule__SimpleParameterCS__Group__3
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterCS__Group__2__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterCSAccess().getReferredTypedModelAssignment_2()); }
+(rule__SimpleParameterCS__ReferredTypedModelAssignment_2)
+{ after(grammarAccess.getSimpleParameterCSAccess().getReferredTypedModelAssignment_2()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__SimpleParameterCS__Group__3
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__SimpleParameterCS__Group__3__Impl
+	rule__SimpleParameterCS__Group__4
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterCS__Group__3__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterCSAccess().getNameAssignment_3()); }
+(rule__SimpleParameterCS__NameAssignment_3)
+{ after(grammarAccess.getSimpleParameterCSAccess().getNameAssignment_3()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__SimpleParameterCS__Group__4
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__SimpleParameterCS__Group__4__Impl
+	rule__SimpleParameterCS__Group__5
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterCS__Group__4__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterCSAccess().getColonKeyword_4()); }
+
+	':' 
+
+{ after(grammarAccess.getSimpleParameterCSAccess().getColonKeyword_4()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__SimpleParameterCS__Group__5
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__SimpleParameterCS__Group__5__Impl
+	rule__SimpleParameterCS__Group__6
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterCS__Group__5__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterCSAccess().getOwnedTypeAssignment_5()); }
+(rule__SimpleParameterCS__OwnedTypeAssignment_5)
+{ after(grammarAccess.getSimpleParameterCSAccess().getOwnedTypeAssignment_5()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+rule__SimpleParameterCS__Group__6
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+	rule__SimpleParameterCS__Group__6__Impl
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterCS__Group__6__Impl
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterCSAccess().getSemicolonKeyword_6()); }
+
+	';' 
+
+{ after(grammarAccess.getSimpleParameterCSAccess().getSemicolonKeyword_6()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 rule__TransformationCS__Group__0
     @init {
 		int stackSize = keepStackSize();
@@ -25336,6 +26272,44 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+rule__AppendParameterBindingCS__ReferredVariableAssignment_0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getAppendParameterBindingCSAccess().getReferredVariableAppendParameterCrossReference_0_0()); }
+(
+{ before(grammarAccess.getAppendParameterBindingCSAccess().getReferredVariableAppendParameterUnrestrictedNameParserRuleCall_0_0_1()); }
+	ruleUnrestrictedName{ after(grammarAccess.getAppendParameterBindingCSAccess().getReferredVariableAppendParameterUnrestrictedNameParserRuleCall_0_0_1()); }
+)
+{ after(grammarAccess.getAppendParameterBindingCSAccess().getReferredVariableAppendParameterCrossReference_0_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__AppendParameterBindingCS__ValueAssignment_2
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getAppendParameterBindingCSAccess().getValueConnectionVariableCrossReference_2_0()); }
+(
+{ before(grammarAccess.getAppendParameterBindingCSAccess().getValueConnectionVariableUnrestrictedNameParserRuleCall_2_0_1()); }
+	ruleUnrestrictedName{ after(grammarAccess.getAppendParameterBindingCSAccess().getValueConnectionVariableUnrestrictedNameParserRuleCall_2_0_1()); }
+)
+{ after(grammarAccess.getAppendParameterBindingCSAccess().getValueConnectionVariableCrossReference_2_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 rule__AppendParameterCS__NameAssignment_1
     @init {
 		int stackSize = keepStackSize();
@@ -25366,6 +26340,51 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+rule__BufferStatementCS__NameAssignment_1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getBufferStatementCSAccess().getNameUnrestrictedNameParserRuleCall_1_0()); }
+	ruleUnrestrictedName{ after(grammarAccess.getBufferStatementCSAccess().getNameUnrestrictedNameParserRuleCall_1_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__BufferStatementCS__OwnedTypeAssignment_2_1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getBufferStatementCSAccess().getOwnedTypeTypeExpCSParserRuleCall_2_1_0()); }
+	ruleTypeExpCS{ after(grammarAccess.getBufferStatementCSAccess().getOwnedTypeTypeExpCSParserRuleCall_2_1_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__BufferStatementCS__OwnedExpressionAssignment_3_1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getBufferStatementCSAccess().getOwnedExpressionExpCSParserRuleCall_3_1_0()); }
+	ruleExpCS{ after(grammarAccess.getBufferStatementCSAccess().getOwnedExpressionExpCSParserRuleCall_3_1_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 rule__CheckStatementCS__OwnedConditionAssignment_1
     @init {
 		int stackSize = keepStackSize();
@@ -25411,22 +26430,22 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__DeclareStatementCS__IsCheckedAssignment_1
+rule__DeclareStatementCS__IsCheckAssignment_1
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getDeclareStatementCSAccess().getIsCheckedCheckKeyword_1_0()); }
+{ before(grammarAccess.getDeclareStatementCSAccess().getIsCheckCheckKeyword_1_0()); }
 (
-{ before(grammarAccess.getDeclareStatementCSAccess().getIsCheckedCheckKeyword_1_0()); }
+{ before(grammarAccess.getDeclareStatementCSAccess().getIsCheckCheckKeyword_1_0()); }
 
 	'check' 
 
-{ after(grammarAccess.getDeclareStatementCSAccess().getIsCheckedCheckKeyword_1_0()); }
+{ after(grammarAccess.getDeclareStatementCSAccess().getIsCheckCheckKeyword_1_0()); }
 )
 
-{ after(grammarAccess.getDeclareStatementCSAccess().getIsCheckedCheckKeyword_1_0()); }
+{ after(grammarAccess.getDeclareStatementCSAccess().getIsCheckCheckKeyword_1_0()); }
 )
 
 ;
@@ -25578,6 +26597,67 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+rule__GuardParameterBindingCS__IsCheckAssignment_0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getGuardParameterBindingCSAccess().getIsCheckCheckKeyword_0_0()); }
+(
+{ before(grammarAccess.getGuardParameterBindingCSAccess().getIsCheckCheckKeyword_0_0()); }
+
+	'check' 
+
+{ after(grammarAccess.getGuardParameterBindingCSAccess().getIsCheckCheckKeyword_0_0()); }
+)
+
+{ after(grammarAccess.getGuardParameterBindingCSAccess().getIsCheckCheckKeyword_0_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__GuardParameterBindingCS__ReferredVariableAssignment_1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getGuardParameterBindingCSAccess().getReferredVariableGuardParameterCrossReference_1_0()); }
+(
+{ before(grammarAccess.getGuardParameterBindingCSAccess().getReferredVariableGuardParameterUnrestrictedNameParserRuleCall_1_0_1()); }
+	ruleUnrestrictedName{ after(grammarAccess.getGuardParameterBindingCSAccess().getReferredVariableGuardParameterUnrestrictedNameParserRuleCall_1_0_1()); }
+)
+{ after(grammarAccess.getGuardParameterBindingCSAccess().getReferredVariableGuardParameterCrossReference_1_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__GuardParameterBindingCS__ValueAssignment_3
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getGuardParameterBindingCSAccess().getValueConnectionVariableCrossReference_3_0()); }
+(
+{ before(grammarAccess.getGuardParameterBindingCSAccess().getValueConnectionVariableUnrestrictedNameParserRuleCall_3_0_1()); }
+	ruleUnrestrictedName{ after(grammarAccess.getGuardParameterBindingCSAccess().getValueConnectionVariableUnrestrictedNameParserRuleCall_3_0_1()); }
+)
+{ after(grammarAccess.getGuardParameterBindingCSAccess().getValueConnectionVariableCrossReference_3_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 rule__GuardParameterCS__ReferredTypedModelAssignment_2
     @init {
 		int stackSize = keepStackSize();
@@ -25680,6 +26760,67 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+rule__LoopParameterBindingCS__IsCheckAssignment_0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getLoopParameterBindingCSAccess().getIsCheckCheckKeyword_0_0()); }
+(
+{ before(grammarAccess.getLoopParameterBindingCSAccess().getIsCheckCheckKeyword_0_0()); }
+
+	'check' 
+
+{ after(grammarAccess.getLoopParameterBindingCSAccess().getIsCheckCheckKeyword_0_0()); }
+)
+
+{ after(grammarAccess.getLoopParameterBindingCSAccess().getIsCheckCheckKeyword_0_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__LoopParameterBindingCS__ReferredVariableAssignment_1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getLoopParameterBindingCSAccess().getReferredVariableGuardParameterCrossReference_1_0()); }
+(
+{ before(grammarAccess.getLoopParameterBindingCSAccess().getReferredVariableGuardParameterUnrestrictedNameParserRuleCall_1_0_1()); }
+	ruleUnrestrictedName{ after(grammarAccess.getLoopParameterBindingCSAccess().getReferredVariableGuardParameterUnrestrictedNameParserRuleCall_1_0_1()); }
+)
+{ after(grammarAccess.getLoopParameterBindingCSAccess().getReferredVariableGuardParameterCrossReference_1_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__LoopParameterBindingCS__ValueAssignment_3
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getLoopParameterBindingCSAccess().getValueLoopVariableCrossReference_3_0()); }
+(
+{ before(grammarAccess.getLoopParameterBindingCSAccess().getValueLoopVariableUnrestrictedNameParserRuleCall_3_0_1()); }
+	ruleUnrestrictedName{ after(grammarAccess.getLoopParameterBindingCSAccess().getValueLoopVariableUnrestrictedNameParserRuleCall_3_0_1()); }
+)
+{ after(grammarAccess.getLoopParameterBindingCSAccess().getValueLoopVariableCrossReference_3_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 rule__MappingCS__NameAssignment_2
     @init {
 		int stackSize = keepStackSize();
@@ -25793,14 +26934,22 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MappingCallCS__OwnedPathNameAssignment_3
+rule__MappingCallCS__IsInstallAssignment_2_1
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMappingCallCSAccess().getOwnedPathNamePathNameCSParserRuleCall_3_0()); }
-	rulePathNameCS{ after(grammarAccess.getMappingCallCSAccess().getOwnedPathNamePathNameCSParserRuleCall_3_0()); }
+{ before(grammarAccess.getMappingCallCSAccess().getIsInstallInstallKeyword_2_1_0()); }
+(
+{ before(grammarAccess.getMappingCallCSAccess().getIsInstallInstallKeyword_2_1_0()); }
+
+	'install' 
+
+{ after(grammarAccess.getMappingCallCSAccess().getIsInstallInstallKeyword_2_1_0()); }
+)
+
+{ after(grammarAccess.getMappingCallCSAccess().getIsInstallInstallKeyword_2_1_0()); }
 )
 
 ;
@@ -25808,14 +26957,22 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MappingCallCS__OwnedBindingsAssignment_5
+rule__MappingCallCS__IsInvokeAssignment_2_2
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMappingCallCSAccess().getOwnedBindingsMappingCallBindingCSParserRuleCall_5_0()); }
-	ruleMappingCallBindingCS{ after(grammarAccess.getMappingCallCSAccess().getOwnedBindingsMappingCallBindingCSParserRuleCall_5_0()); }
+{ before(grammarAccess.getMappingCallCSAccess().getIsInvokeInvokeKeyword_2_2_0()); }
+(
+{ before(grammarAccess.getMappingCallCSAccess().getIsInvokeInvokeKeyword_2_2_0()); }
+
+	'invoke' 
+
+{ after(grammarAccess.getMappingCallCSAccess().getIsInvokeInvokeKeyword_2_2_0()); }
+)
+
+{ after(grammarAccess.getMappingCallCSAccess().getIsInvokeInvokeKeyword_2_2_0()); }
 )
 
 ;
@@ -25823,18 +26980,14 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MappingCallBindingCS__ReferredVariableAssignment_0
+rule__MappingCallCS__OwnedPathNameAssignment_3
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMappingCallBindingCSAccess().getReferredVariableVariableDeclarationCrossReference_0_0()); }
-(
-{ before(grammarAccess.getMappingCallBindingCSAccess().getReferredVariableVariableDeclarationUnrestrictedNameParserRuleCall_0_0_1()); }
-	ruleUnrestrictedName{ after(grammarAccess.getMappingCallBindingCSAccess().getReferredVariableVariableDeclarationUnrestrictedNameParserRuleCall_0_0_1()); }
-)
-{ after(grammarAccess.getMappingCallBindingCSAccess().getReferredVariableVariableDeclarationCrossReference_0_0()); }
+{ before(grammarAccess.getMappingCallCSAccess().getOwnedPathNamePathNameCSParserRuleCall_3_0()); }
+	rulePathNameCS{ after(grammarAccess.getMappingCallCSAccess().getOwnedPathNamePathNameCSParserRuleCall_3_0()); }
 )
 
 ;
@@ -25842,14 +26995,14 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MappingCallBindingCS__OwnedValueAssignment_2
+rule__MappingCallCS__OwnedBindingsAssignment_5
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMappingCallBindingCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); }
-	ruleExpCS{ after(grammarAccess.getMappingCallBindingCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); }
+{ before(grammarAccess.getMappingCallCSAccess().getOwnedBindingsMappingParameterBindingCSParserRuleCall_5_0()); }
+	ruleMappingParameterBindingCS{ after(grammarAccess.getMappingCallCSAccess().getOwnedBindingsMappingParameterBindingCSParserRuleCall_5_0()); }
 )
 
 ;
@@ -26056,51 +27209,6 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__OutVariableCS__NameAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutVariableCSAccess().getNameUnrestrictedNameParserRuleCall_1_0()); }
-	ruleUnrestrictedName{ after(grammarAccess.getOutVariableCSAccess().getNameUnrestrictedNameParserRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutVariableCS__OwnedTypeAssignment_3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutVariableCSAccess().getOwnedTypeTypeExpCSParserRuleCall_3_0()); }
-	ruleTypeExpCS{ after(grammarAccess.getOutVariableCSAccess().getOwnedTypeTypeExpCSParserRuleCall_3_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutVariableCS__OwnedExpressionAssignment_4_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutVariableCSAccess().getOwnedExpressionExpCSParserRuleCall_4_1_0()); }
-	ruleExpCS{ after(grammarAccess.getOutVariableCSAccess().getOwnedExpressionExpCSParserRuleCall_4_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
 rule__ParamDeclarationCS__NameAssignment_0
     @init {
 		int stackSize = keepStackSize();
@@ -26471,6 +27579,112 @@ finally {
 	restoreStackSize(stackSize);
 }
 
+rule__SimpleParameterBindingCS__IsCheckAssignment_0
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterBindingCSAccess().getIsCheckCheckKeyword_0_0()); }
+(
+{ before(grammarAccess.getSimpleParameterBindingCSAccess().getIsCheckCheckKeyword_0_0()); }
+
+	'check' 
+
+{ after(grammarAccess.getSimpleParameterBindingCSAccess().getIsCheckCheckKeyword_0_0()); }
+)
+
+{ after(grammarAccess.getSimpleParameterBindingCSAccess().getIsCheckCheckKeyword_0_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterBindingCS__ReferredVariableAssignment_1
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterBindingCSAccess().getReferredVariableSimpleParameterCrossReference_1_0()); }
+(
+{ before(grammarAccess.getSimpleParameterBindingCSAccess().getReferredVariableSimpleParameterUnrestrictedNameParserRuleCall_1_0_1()); }
+	ruleUnrestrictedName{ after(grammarAccess.getSimpleParameterBindingCSAccess().getReferredVariableSimpleParameterUnrestrictedNameParserRuleCall_1_0_1()); }
+)
+{ after(grammarAccess.getSimpleParameterBindingCSAccess().getReferredVariableSimpleParameterCrossReference_1_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterBindingCS__OwnedValueAssignment_3
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterBindingCSAccess().getOwnedValueExpCSParserRuleCall_3_0()); }
+	ruleExpCS{ after(grammarAccess.getSimpleParameterBindingCSAccess().getOwnedValueExpCSParserRuleCall_3_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterCS__ReferredTypedModelAssignment_2
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterCSAccess().getReferredTypedModelImperativeTypedModelCrossReference_2_0()); }
+(
+{ before(grammarAccess.getSimpleParameterCSAccess().getReferredTypedModelImperativeTypedModelUnrestrictedNameParserRuleCall_2_0_1()); }
+	ruleUnrestrictedName{ after(grammarAccess.getSimpleParameterCSAccess().getReferredTypedModelImperativeTypedModelUnrestrictedNameParserRuleCall_2_0_1()); }
+)
+{ after(grammarAccess.getSimpleParameterCSAccess().getReferredTypedModelImperativeTypedModelCrossReference_2_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterCS__NameAssignment_3
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterCSAccess().getNameUnrestrictedNameParserRuleCall_3_0()); }
+	ruleUnrestrictedName{ after(grammarAccess.getSimpleParameterCSAccess().getNameUnrestrictedNameParserRuleCall_3_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
+rule__SimpleParameterCS__OwnedTypeAssignment_5
+    @init {
+		int stackSize = keepStackSize();
+    }
+:
+(
+{ before(grammarAccess.getSimpleParameterCSAccess().getOwnedTypeTypeExpCSParserRuleCall_5_0()); }
+	ruleTypeExpCS{ after(grammarAccess.getSimpleParameterCSAccess().getOwnedTypeTypeExpCSParserRuleCall_5_0()); }
+)
+
+;
+finally {
+	restoreStackSize(stackSize);
+}
+
 rule__TransformationCS__OwnedPathNameAssignment_1
     @init {
 		int stackSize = keepStackSize();
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperative.tokens b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperative.tokens
index c04d93ea4..2ba62c8a5 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperative.tokens
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperative.tokens
@@ -1,135 +1,141 @@
-'!composes'=139
-'!derived'=122
-'!id'=124
-'!ordered'=126
-'!readonly'=128
-'!resolve'=141
-'!serializable'=29
-'!transient'=129
-'!unique'=131
-'!unsettable'=133
-'!volatile'=135
-'#'=96
-'&&'=115
-'('=82
-')'=83
-'*'=32
-'+'=34
-'++'=100
-'+='=67
-','=69
-'-'=30
-'->'=46
-'.'=45
-'..'=99
-'/'=33
-':'=71
-'::'=84
-':='=73
-';'=17
-'<'=36
-'<-'=102
-'<='=38
-'<>'=40
-'='=39
-'>'=35
-'>='=37
-'?'=65
-'?->'=48
-'?.'=47
-'@'=146
-'Bag'=60
-'Boolean'=51
-'Collection'=62
-'Integer'=52
-'Lambda'=101
-'Map'=49
-'OclAny'=56
-'OclInvalid'=57
-'OclVoid'=58
-'OrderedSet'=63
-'Real'=53
-'Sequence'=61
-'Set'=59
-'String'=54
-'Tuple'=50
-'UnlimitedNatural'=55
-'['=106
-']'=107
-'abstract'=142
-'add'=66
-'and'=41
-'append'=70
-'attribute'=86
-'body'=94
-'call'=77
-'check'=18
-'class'=97
-'composes'=138
-'datatype'=89
-'definition'=120
-'derivation'=88
-'derived'=121
-'else'=110
-'elseif'=112
-'endif'=111
-'enforce'=19
-'enum'=90
-'extends'=98
-'false'=145
-'for'=78
-'id'=123
-'if'=108
-'implies'=44
-'import'=20
-'imports'=21
-'in'=74
-'infinite'=116
-'initial'=87
-'interface'=143
-'invalid'=103
-'let'=113
-'library'=22
-'literal'=91
-'map'=23
-'new'=79
-'not'=31
-'notify'=118
-'null'=104
-'observe'=68
-'operation'=92
-'or'=42
-'ordered'=125
-'out'=80
-'package'=81
-'pre'=105
-'primitive'=136
-'property'=95
-'query'=24
-'readonly'=127
-'realize'=25
-'refines'=26
-'resolve'=140
-'self'=114
-'serializable'=137
-'set'=85
-'static'=119
-'then'=109
-'throws'=93
-'transformation'=27
-'transient'=117
-'true'=144
-'unique'=130
-'unsettable'=132
-'uses'=28
-'var'=72
-'volatile'=134
-'xor'=43
-'{'=75
-'|'=147
-'|1'=148
-'|?'=64
-'}'=76
+'!composes'=145
+'!derived'=128
+'!id'=130
+'!ordered'=132
+'!readonly'=134
+'!resolve'=147
+'!serializable'=30
+'!transient'=135
+'!unique'=137
+'!unsettable'=139
+'!volatile'=141
+'#'=100
+'&&'=119
+'('=86
+')'=87
+'*'=33
+'+'=35
+'++'=104
+'+='=68
+','=70
+'-'=31
+'->'=47
+'.'=46
+'..'=103
+'/'=34
+':'=73
+'::'=88
+':='=75
+';'=18
+'<'=37
+'<-'=106
+'<='=39
+'<>'=41
+'='=40
+'>'=36
+'>='=38
+'?'=66
+'?->'=49
+'?.'=48
+'@'=152
+'Bag'=61
+'Boolean'=52
+'Collection'=63
+'Integer'=53
+'Lambda'=105
+'Map'=50
+'OclAny'=57
+'OclInvalid'=58
+'OclVoid'=59
+'OrderedSet'=64
+'Real'=54
+'Sequence'=62
+'Set'=60
+'String'=55
+'Tuple'=51
+'UnlimitedNatural'=56
+'['=110
+']'=111
+'abstract'=148
+'add'=67
+'and'=42
+'append'=72
+'appendsTo'=71
+'attribute'=90
+'body'=98
+'buffer'=74
+'call'=17
+'check'=19
+'class'=101
+'composes'=144
+'consumes'=77
+'datatype'=93
+'definition'=126
+'derivation'=92
+'derived'=127
+'else'=114
+'elseif'=116
+'endif'=115
+'enforce'=20
+'enum'=94
+'extends'=102
+'false'=151
+'for'=83
+'guard'=78
+'id'=129
+'if'=112
+'implies'=45
+'import'=21
+'imports'=22
+'in'=82
+'infinite'=120
+'initial'=91
+'install'=121
+'interface'=149
+'invalid'=107
+'invoke'=122
+'iterates'=79
+'let'=117
+'library'=23
+'literal'=95
+'map'=24
+'new'=84
+'not'=32
+'notify'=124
+'null'=108
+'observe'=69
+'operation'=96
+'or'=43
+'ordered'=131
+'package'=85
+'pre'=109
+'primitive'=142
+'property'=99
+'query'=25
+'readonly'=133
+'realize'=26
+'refines'=27
+'resolve'=146
+'self'=118
+'serializable'=143
+'set'=89
+'static'=125
+'then'=113
+'throws'=97
+'transformation'=28
+'transient'=123
+'true'=150
+'unique'=136
+'unsettable'=138
+'uses'=29
+'var'=76
+'volatile'=140
+'xor'=44
+'{'=80
+'|'=153
+'|1'=154
+'|?'=65
+'}'=81
 RULE_ANY_OTHER=16
 RULE_DOUBLE_QUOTED_STRING=11
 RULE_ESCAPED_CHARACTER=9
@@ -192,6 +198,12 @@ T__145=145
 T__146=146
 T__147=147
 T__148=148
+T__149=149
+T__150=150
+T__151=151
+T__152=152
+T__153=153
+T__154=154
 T__17=17
 T__18=18
 T__19=19
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperativeLexer.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperativeLexer.java
index d3992fef7..2b2378e94 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperativeLexer.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperativeLexer.java
@@ -66,6 +66,11 @@ public class InternalQVTimperativeLexer extends Lexer {
     public static final int T__30=30;
     public static final int T__31=31;
     public static final int T__32=32;
+    public static final int T__154=154;
+    public static final int T__151=151;
+    public static final int T__150=150;
+    public static final int T__153=153;
+    public static final int T__152=152;
     public static final int RULE_SINGLE_QUOTED_STRING=5;
     public static final int T__48=48;
     public static final int T__49=49;
@@ -81,6 +86,7 @@ public class InternalQVTimperativeLexer extends Lexer {
     public static final int T__147=147;
     public static final int T__42=42;
     public static final int T__43=43;
+    public static final int T__149=149;
     public static final int T__91=91;
     public static final int T__100=100;
     public static final int T__92=92;
@@ -177,10 +183,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:11:7: ( ';' )
-            // InternalQVTimperative.g:11:9: ';'
+            // InternalQVTimperative.g:11:7: ( 'call' )
+            // InternalQVTimperative.g:11:9: 'call'
             {
-            match(';'); 
+            match("call"); 
+
 
             }
 
@@ -197,11 +204,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:12:7: ( 'check' )
-            // InternalQVTimperative.g:12:9: 'check'
+            // InternalQVTimperative.g:12:7: ( ';' )
+            // InternalQVTimperative.g:12:9: ';'
             {
-            match("check"); 
-
+            match(';'); 
 
             }
 
@@ -218,10 +224,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:13:7: ( 'enforce' )
-            // InternalQVTimperative.g:13:9: 'enforce'
+            // InternalQVTimperative.g:13:7: ( 'check' )
+            // InternalQVTimperative.g:13:9: 'check'
             {
-            match("enforce"); 
+            match("check"); 
 
 
             }
@@ -239,10 +245,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:14:7: ( 'import' )
-            // InternalQVTimperative.g:14:9: 'import'
+            // InternalQVTimperative.g:14:7: ( 'enforce' )
+            // InternalQVTimperative.g:14:9: 'enforce'
             {
-            match("import"); 
+            match("enforce"); 
 
 
             }
@@ -260,10 +266,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:15:7: ( 'imports' )
-            // InternalQVTimperative.g:15:9: 'imports'
+            // InternalQVTimperative.g:15:7: ( 'import' )
+            // InternalQVTimperative.g:15:9: 'import'
             {
-            match("imports"); 
+            match("import"); 
 
 
             }
@@ -281,10 +287,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:16:7: ( 'library' )
-            // InternalQVTimperative.g:16:9: 'library'
+            // InternalQVTimperative.g:16:7: ( 'imports' )
+            // InternalQVTimperative.g:16:9: 'imports'
             {
-            match("library"); 
+            match("imports"); 
 
 
             }
@@ -302,10 +308,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:17:7: ( 'map' )
-            // InternalQVTimperative.g:17:9: 'map'
+            // InternalQVTimperative.g:17:7: ( 'library' )
+            // InternalQVTimperative.g:17:9: 'library'
             {
-            match("map"); 
+            match("library"); 
 
 
             }
@@ -323,10 +329,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:18:7: ( 'query' )
-            // InternalQVTimperative.g:18:9: 'query'
+            // InternalQVTimperative.g:18:7: ( 'map' )
+            // InternalQVTimperative.g:18:9: 'map'
             {
-            match("query"); 
+            match("map"); 
 
 
             }
@@ -344,10 +350,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:19:7: ( 'realize' )
-            // InternalQVTimperative.g:19:9: 'realize'
+            // InternalQVTimperative.g:19:7: ( 'query' )
+            // InternalQVTimperative.g:19:9: 'query'
             {
-            match("realize"); 
+            match("query"); 
 
 
             }
@@ -365,10 +371,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:20:7: ( 'refines' )
-            // InternalQVTimperative.g:20:9: 'refines'
+            // InternalQVTimperative.g:20:7: ( 'realize' )
+            // InternalQVTimperative.g:20:9: 'realize'
             {
-            match("refines"); 
+            match("realize"); 
 
 
             }
@@ -386,10 +392,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:21:7: ( 'transformation' )
-            // InternalQVTimperative.g:21:9: 'transformation'
+            // InternalQVTimperative.g:21:7: ( 'refines' )
+            // InternalQVTimperative.g:21:9: 'refines'
             {
-            match("transformation"); 
+            match("refines"); 
 
 
             }
@@ -407,10 +413,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:22:7: ( 'uses' )
-            // InternalQVTimperative.g:22:9: 'uses'
+            // InternalQVTimperative.g:22:7: ( 'transformation' )
+            // InternalQVTimperative.g:22:9: 'transformation'
             {
-            match("uses"); 
+            match("transformation"); 
 
 
             }
@@ -428,10 +434,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:23:7: ( '!serializable' )
-            // InternalQVTimperative.g:23:9: '!serializable'
+            // InternalQVTimperative.g:23:7: ( 'uses' )
+            // InternalQVTimperative.g:23:9: 'uses'
             {
-            match("!serializable"); 
+            match("uses"); 
 
 
             }
@@ -449,10 +455,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:24:7: ( '-' )
-            // InternalQVTimperative.g:24:9: '-'
+            // InternalQVTimperative.g:24:7: ( '!serializable' )
+            // InternalQVTimperative.g:24:9: '!serializable'
             {
-            match('-'); 
+            match("!serializable"); 
+
 
             }
 
@@ -469,11 +476,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:25:7: ( 'not' )
-            // InternalQVTimperative.g:25:9: 'not'
+            // InternalQVTimperative.g:25:7: ( '-' )
+            // InternalQVTimperative.g:25:9: '-'
             {
-            match("not"); 
-
+            match('-'); 
 
             }
 
@@ -490,10 +496,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:26:7: ( '*' )
-            // InternalQVTimperative.g:26:9: '*'
+            // InternalQVTimperative.g:26:7: ( 'not' )
+            // InternalQVTimperative.g:26:9: 'not'
             {
-            match('*'); 
+            match("not"); 
+
 
             }
 
@@ -510,10 +517,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:27:7: ( '/' )
-            // InternalQVTimperative.g:27:9: '/'
+            // InternalQVTimperative.g:27:7: ( '*' )
+            // InternalQVTimperative.g:27:9: '*'
             {
-            match('/'); 
+            match('*'); 
 
             }
 
@@ -530,10 +537,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:28:7: ( '+' )
-            // InternalQVTimperative.g:28:9: '+'
+            // InternalQVTimperative.g:28:7: ( '/' )
+            // InternalQVTimperative.g:28:9: '/'
             {
-            match('+'); 
+            match('/'); 
 
             }
 
@@ -550,10 +557,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:29:7: ( '>' )
-            // InternalQVTimperative.g:29:9: '>'
+            // InternalQVTimperative.g:29:7: ( '+' )
+            // InternalQVTimperative.g:29:9: '+'
             {
-            match('>'); 
+            match('+'); 
 
             }
 
@@ -570,10 +577,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:30:7: ( '<' )
-            // InternalQVTimperative.g:30:9: '<'
+            // InternalQVTimperative.g:30:7: ( '>' )
+            // InternalQVTimperative.g:30:9: '>'
             {
-            match('<'); 
+            match('>'); 
 
             }
 
@@ -590,11 +597,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:31:7: ( '>=' )
-            // InternalQVTimperative.g:31:9: '>='
+            // InternalQVTimperative.g:31:7: ( '<' )
+            // InternalQVTimperative.g:31:9: '<'
             {
-            match(">="); 
-
+            match('<'); 
 
             }
 
@@ -611,10 +617,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:32:7: ( '<=' )
-            // InternalQVTimperative.g:32:9: '<='
+            // InternalQVTimperative.g:32:7: ( '>=' )
+            // InternalQVTimperative.g:32:9: '>='
             {
-            match("<="); 
+            match(">="); 
 
 
             }
@@ -632,10 +638,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:33:7: ( '=' )
-            // InternalQVTimperative.g:33:9: '='
+            // InternalQVTimperative.g:33:7: ( '<=' )
+            // InternalQVTimperative.g:33:9: '<='
             {
-            match('='); 
+            match("<="); 
+
 
             }
 
@@ -652,11 +659,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:34:7: ( '<>' )
-            // InternalQVTimperative.g:34:9: '<>'
+            // InternalQVTimperative.g:34:7: ( '=' )
+            // InternalQVTimperative.g:34:9: '='
             {
-            match("<>"); 
-
+            match('='); 
 
             }
 
@@ -673,10 +679,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:35:7: ( 'and' )
-            // InternalQVTimperative.g:35:9: 'and'
+            // InternalQVTimperative.g:35:7: ( '<>' )
+            // InternalQVTimperative.g:35:9: '<>'
             {
-            match("and"); 
+            match("<>"); 
 
 
             }
@@ -694,10 +700,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:36:7: ( 'or' )
-            // InternalQVTimperative.g:36:9: 'or'
+            // InternalQVTimperative.g:36:7: ( 'and' )
+            // InternalQVTimperative.g:36:9: 'and'
             {
-            match("or"); 
+            match("and"); 
 
 
             }
@@ -715,10 +721,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:37:7: ( 'xor' )
-            // InternalQVTimperative.g:37:9: 'xor'
+            // InternalQVTimperative.g:37:7: ( 'or' )
+            // InternalQVTimperative.g:37:9: 'or'
             {
-            match("xor"); 
+            match("or"); 
 
 
             }
@@ -736,10 +742,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:38:7: ( 'implies' )
-            // InternalQVTimperative.g:38:9: 'implies'
+            // InternalQVTimperative.g:38:7: ( 'xor' )
+            // InternalQVTimperative.g:38:9: 'xor'
             {
-            match("implies"); 
+            match("xor"); 
 
 
             }
@@ -757,10 +763,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__45;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:39:7: ( '.' )
-            // InternalQVTimperative.g:39:9: '.'
+            // InternalQVTimperative.g:39:7: ( 'implies' )
+            // InternalQVTimperative.g:39:9: 'implies'
             {
-            match('.'); 
+            match("implies"); 
+
 
             }
 
@@ -777,11 +784,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__46;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:40:7: ( '->' )
-            // InternalQVTimperative.g:40:9: '->'
+            // InternalQVTimperative.g:40:7: ( '.' )
+            // InternalQVTimperative.g:40:9: '.'
             {
-            match("->"); 
-
+            match('.'); 
 
             }
 
@@ -798,10 +804,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__47;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:41:7: ( '?.' )
-            // InternalQVTimperative.g:41:9: '?.'
+            // InternalQVTimperative.g:41:7: ( '->' )
+            // InternalQVTimperative.g:41:9: '->'
             {
-            match("?."); 
+            match("->"); 
 
 
             }
@@ -819,10 +825,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__48;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:42:7: ( '?->' )
-            // InternalQVTimperative.g:42:9: '?->'
+            // InternalQVTimperative.g:42:7: ( '?.' )
+            // InternalQVTimperative.g:42:9: '?.'
             {
-            match("?->"); 
+            match("?."); 
 
 
             }
@@ -840,10 +846,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__49;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:43:7: ( 'Map' )
-            // InternalQVTimperative.g:43:9: 'Map'
+            // InternalQVTimperative.g:43:7: ( '?->' )
+            // InternalQVTimperative.g:43:9: '?->'
             {
-            match("Map"); 
+            match("?->"); 
 
 
             }
@@ -861,10 +867,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__50;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:44:7: ( 'Tuple' )
-            // InternalQVTimperative.g:44:9: 'Tuple'
+            // InternalQVTimperative.g:44:7: ( 'Map' )
+            // InternalQVTimperative.g:44:9: 'Map'
             {
-            match("Tuple"); 
+            match("Map"); 
 
 
             }
@@ -882,10 +888,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__51;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:45:7: ( 'Boolean' )
-            // InternalQVTimperative.g:45:9: 'Boolean'
+            // InternalQVTimperative.g:45:7: ( 'Tuple' )
+            // InternalQVTimperative.g:45:9: 'Tuple'
             {
-            match("Boolean"); 
+            match("Tuple"); 
 
 
             }
@@ -903,10 +909,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__52;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:46:7: ( 'Integer' )
-            // InternalQVTimperative.g:46:9: 'Integer'
+            // InternalQVTimperative.g:46:7: ( 'Boolean' )
+            // InternalQVTimperative.g:46:9: 'Boolean'
             {
-            match("Integer"); 
+            match("Boolean"); 
 
 
             }
@@ -924,10 +930,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__53;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:47:7: ( 'Real' )
-            // InternalQVTimperative.g:47:9: 'Real'
+            // InternalQVTimperative.g:47:7: ( 'Integer' )
+            // InternalQVTimperative.g:47:9: 'Integer'
             {
-            match("Real"); 
+            match("Integer"); 
 
 
             }
@@ -945,10 +951,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__54;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:48:7: ( 'String' )
-            // InternalQVTimperative.g:48:9: 'String'
+            // InternalQVTimperative.g:48:7: ( 'Real' )
+            // InternalQVTimperative.g:48:9: 'Real'
             {
-            match("String"); 
+            match("Real"); 
 
 
             }
@@ -966,10 +972,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__55;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:49:7: ( 'UnlimitedNatural' )
-            // InternalQVTimperative.g:49:9: 'UnlimitedNatural'
+            // InternalQVTimperative.g:49:7: ( 'String' )
+            // InternalQVTimperative.g:49:9: 'String'
             {
-            match("UnlimitedNatural"); 
+            match("String"); 
 
 
             }
@@ -987,10 +993,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__56;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:50:7: ( 'OclAny' )
-            // InternalQVTimperative.g:50:9: 'OclAny'
+            // InternalQVTimperative.g:50:7: ( 'UnlimitedNatural' )
+            // InternalQVTimperative.g:50:9: 'UnlimitedNatural'
             {
-            match("OclAny"); 
+            match("UnlimitedNatural"); 
 
 
             }
@@ -1008,10 +1014,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__57;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:51:7: ( 'OclInvalid' )
-            // InternalQVTimperative.g:51:9: 'OclInvalid'
+            // InternalQVTimperative.g:51:7: ( 'OclAny' )
+            // InternalQVTimperative.g:51:9: 'OclAny'
             {
-            match("OclInvalid"); 
+            match("OclAny"); 
 
 
             }
@@ -1029,10 +1035,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__58;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:52:7: ( 'OclVoid' )
-            // InternalQVTimperative.g:52:9: 'OclVoid'
+            // InternalQVTimperative.g:52:7: ( 'OclInvalid' )
+            // InternalQVTimperative.g:52:9: 'OclInvalid'
             {
-            match("OclVoid"); 
+            match("OclInvalid"); 
 
 
             }
@@ -1050,10 +1056,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__59;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:53:7: ( 'Set' )
-            // InternalQVTimperative.g:53:9: 'Set'
+            // InternalQVTimperative.g:53:7: ( 'OclVoid' )
+            // InternalQVTimperative.g:53:9: 'OclVoid'
             {
-            match("Set"); 
+            match("OclVoid"); 
 
 
             }
@@ -1071,10 +1077,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__60;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:54:7: ( 'Bag' )
-            // InternalQVTimperative.g:54:9: 'Bag'
+            // InternalQVTimperative.g:54:7: ( 'Set' )
+            // InternalQVTimperative.g:54:9: 'Set'
             {
-            match("Bag"); 
+            match("Set"); 
 
 
             }
@@ -1092,10 +1098,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__61;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:55:7: ( 'Sequence' )
-            // InternalQVTimperative.g:55:9: 'Sequence'
+            // InternalQVTimperative.g:55:7: ( 'Bag' )
+            // InternalQVTimperative.g:55:9: 'Bag'
             {
-            match("Sequence"); 
+            match("Bag"); 
 
 
             }
@@ -1113,10 +1119,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__62;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:56:7: ( 'Collection' )
-            // InternalQVTimperative.g:56:9: 'Collection'
+            // InternalQVTimperative.g:56:7: ( 'Sequence' )
+            // InternalQVTimperative.g:56:9: 'Sequence'
             {
-            match("Collection"); 
+            match("Sequence"); 
 
 
             }
@@ -1134,10 +1140,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__63;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:57:7: ( 'OrderedSet' )
-            // InternalQVTimperative.g:57:9: 'OrderedSet'
+            // InternalQVTimperative.g:57:7: ( 'Collection' )
+            // InternalQVTimperative.g:57:9: 'Collection'
             {
-            match("OrderedSet"); 
+            match("Collection"); 
 
 
             }
@@ -1155,10 +1161,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__64;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:58:7: ( '|?' )
-            // InternalQVTimperative.g:58:9: '|?'
+            // InternalQVTimperative.g:58:7: ( 'OrderedSet' )
+            // InternalQVTimperative.g:58:9: 'OrderedSet'
             {
-            match("|?"); 
+            match("OrderedSet"); 
 
 
             }
@@ -1176,10 +1182,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__65;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:59:7: ( '?' )
-            // InternalQVTimperative.g:59:9: '?'
+            // InternalQVTimperative.g:59:7: ( '|?' )
+            // InternalQVTimperative.g:59:9: '|?'
             {
-            match('?'); 
+            match("|?"); 
+
 
             }
 
@@ -1196,11 +1203,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__66;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:60:7: ( 'add' )
-            // InternalQVTimperative.g:60:9: 'add'
+            // InternalQVTimperative.g:60:7: ( '?' )
+            // InternalQVTimperative.g:60:9: '?'
             {
-            match("add"); 
-
+            match('?'); 
 
             }
 
@@ -1217,10 +1223,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__67;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:61:7: ( '+=' )
-            // InternalQVTimperative.g:61:9: '+='
+            // InternalQVTimperative.g:61:7: ( 'add' )
+            // InternalQVTimperative.g:61:9: 'add'
             {
-            match("+="); 
+            match("add"); 
 
 
             }
@@ -1238,10 +1244,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__68;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:62:7: ( 'observe' )
-            // InternalQVTimperative.g:62:9: 'observe'
+            // InternalQVTimperative.g:62:7: ( '+=' )
+            // InternalQVTimperative.g:62:9: '+='
             {
-            match("observe"); 
+            match("+="); 
 
 
             }
@@ -1259,10 +1265,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__69;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:63:7: ( ',' )
-            // InternalQVTimperative.g:63:9: ','
+            // InternalQVTimperative.g:63:7: ( 'observe' )
+            // InternalQVTimperative.g:63:9: 'observe'
             {
-            match(','); 
+            match("observe"); 
+
 
             }
 
@@ -1279,11 +1286,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__70;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:64:7: ( 'append' )
-            // InternalQVTimperative.g:64:9: 'append'
+            // InternalQVTimperative.g:64:7: ( ',' )
+            // InternalQVTimperative.g:64:9: ','
             {
-            match("append"); 
-
+            match(','); 
 
             }
 
@@ -1300,10 +1306,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__71;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:65:7: ( ':' )
-            // InternalQVTimperative.g:65:9: ':'
+            // InternalQVTimperative.g:65:7: ( 'appendsTo' )
+            // InternalQVTimperative.g:65:9: 'appendsTo'
             {
-            match(':'); 
+            match("appendsTo"); 
+
 
             }
 
@@ -1320,10 +1327,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__72;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:66:7: ( 'var' )
-            // InternalQVTimperative.g:66:9: 'var'
+            // InternalQVTimperative.g:66:7: ( 'append' )
+            // InternalQVTimperative.g:66:9: 'append'
             {
-            match("var"); 
+            match("append"); 
 
 
             }
@@ -1341,11 +1348,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__73;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:67:7: ( ':=' )
-            // InternalQVTimperative.g:67:9: ':='
+            // InternalQVTimperative.g:67:7: ( ':' )
+            // InternalQVTimperative.g:67:9: ':'
             {
-            match(":="); 
-
+            match(':'); 
 
             }
 
@@ -1362,10 +1368,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__74;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:68:7: ( 'in' )
-            // InternalQVTimperative.g:68:9: 'in'
+            // InternalQVTimperative.g:68:7: ( 'buffer' )
+            // InternalQVTimperative.g:68:9: 'buffer'
             {
-            match("in"); 
+            match("buffer"); 
 
 
             }
@@ -1383,10 +1389,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__75;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:69:7: ( '{' )
-            // InternalQVTimperative.g:69:9: '{'
+            // InternalQVTimperative.g:69:7: ( ':=' )
+            // InternalQVTimperative.g:69:9: ':='
             {
-            match('{'); 
+            match(":="); 
+
 
             }
 
@@ -1403,10 +1410,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__76;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:70:7: ( '}' )
-            // InternalQVTimperative.g:70:9: '}'
+            // InternalQVTimperative.g:70:7: ( 'var' )
+            // InternalQVTimperative.g:70:9: 'var'
             {
-            match('}'); 
+            match("var"); 
+
 
             }
 
@@ -1423,10 +1431,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__77;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:71:7: ( 'call' )
-            // InternalQVTimperative.g:71:9: 'call'
+            // InternalQVTimperative.g:71:7: ( 'consumes' )
+            // InternalQVTimperative.g:71:9: 'consumes'
             {
-            match("call"); 
+            match("consumes"); 
 
 
             }
@@ -1444,10 +1452,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__78;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:72:7: ( 'for' )
-            // InternalQVTimperative.g:72:9: 'for'
+            // InternalQVTimperative.g:72:7: ( 'guard' )
+            // InternalQVTimperative.g:72:9: 'guard'
             {
-            match("for"); 
+            match("guard"); 
 
 
             }
@@ -1465,10 +1473,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__79;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:73:7: ( 'new' )
-            // InternalQVTimperative.g:73:9: 'new'
+            // InternalQVTimperative.g:73:7: ( 'iterates' )
+            // InternalQVTimperative.g:73:9: 'iterates'
             {
-            match("new"); 
+            match("iterates"); 
 
 
             }
@@ -1486,11 +1494,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__80;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:74:7: ( 'out' )
-            // InternalQVTimperative.g:74:9: 'out'
+            // InternalQVTimperative.g:74:7: ( '{' )
+            // InternalQVTimperative.g:74:9: '{'
             {
-            match("out"); 
-
+            match('{'); 
 
             }
 
@@ -1507,11 +1514,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__81;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:75:7: ( 'package' )
-            // InternalQVTimperative.g:75:9: 'package'
+            // InternalQVTimperative.g:75:7: ( '}' )
+            // InternalQVTimperative.g:75:9: '}'
             {
-            match("package"); 
-
+            match('}'); 
 
             }
 
@@ -1528,10 +1534,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__82;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:76:7: ( '(' )
-            // InternalQVTimperative.g:76:9: '('
+            // InternalQVTimperative.g:76:7: ( 'in' )
+            // InternalQVTimperative.g:76:9: 'in'
             {
-            match('('); 
+            match("in"); 
+
 
             }
 
@@ -1548,10 +1555,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__83;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:77:7: ( ')' )
-            // InternalQVTimperative.g:77:9: ')'
+            // InternalQVTimperative.g:77:7: ( 'for' )
+            // InternalQVTimperative.g:77:9: 'for'
             {
-            match(')'); 
+            match("for"); 
+
 
             }
 
@@ -1568,10 +1576,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__84;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:78:7: ( '::' )
-            // InternalQVTimperative.g:78:9: '::'
+            // InternalQVTimperative.g:78:7: ( 'new' )
+            // InternalQVTimperative.g:78:9: 'new'
             {
-            match("::"); 
+            match("new"); 
 
 
             }
@@ -1589,10 +1597,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__85;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:79:7: ( 'set' )
-            // InternalQVTimperative.g:79:9: 'set'
+            // InternalQVTimperative.g:79:7: ( 'package' )
+            // InternalQVTimperative.g:79:9: 'package'
             {
-            match("set"); 
+            match("package"); 
 
 
             }
@@ -1610,11 +1618,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__86;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:80:7: ( 'attribute' )
-            // InternalQVTimperative.g:80:9: 'attribute'
+            // InternalQVTimperative.g:80:7: ( '(' )
+            // InternalQVTimperative.g:80:9: '('
             {
-            match("attribute"); 
-
+            match('('); 
 
             }
 
@@ -1631,11 +1638,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__87;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:81:7: ( 'initial' )
-            // InternalQVTimperative.g:81:9: 'initial'
+            // InternalQVTimperative.g:81:7: ( ')' )
+            // InternalQVTimperative.g:81:9: ')'
             {
-            match("initial"); 
-
+            match(')'); 
 
             }
 
@@ -1652,10 +1658,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__88;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:82:7: ( 'derivation' )
-            // InternalQVTimperative.g:82:9: 'derivation'
+            // InternalQVTimperative.g:82:7: ( '::' )
+            // InternalQVTimperative.g:82:9: '::'
             {
-            match("derivation"); 
+            match("::"); 
 
 
             }
@@ -1673,10 +1679,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__89;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:83:7: ( 'datatype' )
-            // InternalQVTimperative.g:83:9: 'datatype'
+            // InternalQVTimperative.g:83:7: ( 'set' )
+            // InternalQVTimperative.g:83:9: 'set'
             {
-            match("datatype"); 
+            match("set"); 
 
 
             }
@@ -1694,10 +1700,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__90;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:84:7: ( 'enum' )
-            // InternalQVTimperative.g:84:9: 'enum'
+            // InternalQVTimperative.g:84:7: ( 'attribute' )
+            // InternalQVTimperative.g:84:9: 'attribute'
             {
-            match("enum"); 
+            match("attribute"); 
 
 
             }
@@ -1715,10 +1721,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__91;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:85:7: ( 'literal' )
-            // InternalQVTimperative.g:85:9: 'literal'
+            // InternalQVTimperative.g:85:7: ( 'initial' )
+            // InternalQVTimperative.g:85:9: 'initial'
             {
-            match("literal"); 
+            match("initial"); 
 
 
             }
@@ -1736,10 +1742,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__92;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:86:7: ( 'operation' )
-            // InternalQVTimperative.g:86:9: 'operation'
+            // InternalQVTimperative.g:86:7: ( 'derivation' )
+            // InternalQVTimperative.g:86:9: 'derivation'
             {
-            match("operation"); 
+            match("derivation"); 
 
 
             }
@@ -1757,10 +1763,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__93;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:87:7: ( 'throws' )
-            // InternalQVTimperative.g:87:9: 'throws'
+            // InternalQVTimperative.g:87:7: ( 'datatype' )
+            // InternalQVTimperative.g:87:9: 'datatype'
             {
-            match("throws"); 
+            match("datatype"); 
 
 
             }
@@ -1778,10 +1784,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__94;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:88:7: ( 'body' )
-            // InternalQVTimperative.g:88:9: 'body'
+            // InternalQVTimperative.g:88:7: ( 'enum' )
+            // InternalQVTimperative.g:88:9: 'enum'
             {
-            match("body"); 
+            match("enum"); 
 
 
             }
@@ -1799,10 +1805,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__95;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:89:7: ( 'property' )
-            // InternalQVTimperative.g:89:9: 'property'
+            // InternalQVTimperative.g:89:7: ( 'literal' )
+            // InternalQVTimperative.g:89:9: 'literal'
             {
-            match("property"); 
+            match("literal"); 
 
 
             }
@@ -1820,10 +1826,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__96;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:90:7: ( '#' )
-            // InternalQVTimperative.g:90:9: '#'
+            // InternalQVTimperative.g:90:7: ( 'operation' )
+            // InternalQVTimperative.g:90:9: 'operation'
             {
-            match('#'); 
+            match("operation"); 
+
 
             }
 
@@ -1840,10 +1847,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__97;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:91:7: ( 'class' )
-            // InternalQVTimperative.g:91:9: 'class'
+            // InternalQVTimperative.g:91:7: ( 'throws' )
+            // InternalQVTimperative.g:91:9: 'throws'
             {
-            match("class"); 
+            match("throws"); 
 
 
             }
@@ -1861,10 +1868,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__98;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:92:7: ( 'extends' )
-            // InternalQVTimperative.g:92:9: 'extends'
+            // InternalQVTimperative.g:92:7: ( 'body' )
+            // InternalQVTimperative.g:92:9: 'body'
             {
-            match("extends"); 
+            match("body"); 
 
 
             }
@@ -1882,10 +1889,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__99;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:93:7: ( '..' )
-            // InternalQVTimperative.g:93:9: '..'
+            // InternalQVTimperative.g:93:7: ( 'property' )
+            // InternalQVTimperative.g:93:9: 'property'
             {
-            match(".."); 
+            match("property"); 
 
 
             }
@@ -1903,11 +1910,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__100;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:94:8: ( '++' )
-            // InternalQVTimperative.g:94:10: '++'
+            // InternalQVTimperative.g:94:8: ( '#' )
+            // InternalQVTimperative.g:94:10: '#'
             {
-            match("++"); 
-
+            match('#'); 
 
             }
 
@@ -1924,10 +1930,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__101;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:95:8: ( 'Lambda' )
-            // InternalQVTimperative.g:95:10: 'Lambda'
+            // InternalQVTimperative.g:95:8: ( 'class' )
+            // InternalQVTimperative.g:95:10: 'class'
             {
-            match("Lambda"); 
+            match("class"); 
 
 
             }
@@ -1945,10 +1951,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__102;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:96:8: ( '<-' )
-            // InternalQVTimperative.g:96:10: '<-'
+            // InternalQVTimperative.g:96:8: ( 'extends' )
+            // InternalQVTimperative.g:96:10: 'extends'
             {
-            match("<-"); 
+            match("extends"); 
 
 
             }
@@ -1966,10 +1972,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__103;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:97:8: ( 'invalid' )
-            // InternalQVTimperative.g:97:10: 'invalid'
+            // InternalQVTimperative.g:97:8: ( '..' )
+            // InternalQVTimperative.g:97:10: '..'
             {
-            match("invalid"); 
+            match(".."); 
 
 
             }
@@ -1987,10 +1993,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__104;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:98:8: ( 'null' )
-            // InternalQVTimperative.g:98:10: 'null'
+            // InternalQVTimperative.g:98:8: ( '++' )
+            // InternalQVTimperative.g:98:10: '++'
             {
-            match("null"); 
+            match("++"); 
 
 
             }
@@ -2008,10 +2014,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__105;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:99:8: ( 'pre' )
-            // InternalQVTimperative.g:99:10: 'pre'
+            // InternalQVTimperative.g:99:8: ( 'Lambda' )
+            // InternalQVTimperative.g:99:10: 'Lambda'
             {
-            match("pre"); 
+            match("Lambda"); 
 
 
             }
@@ -2029,10 +2035,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__106;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:100:8: ( '[' )
-            // InternalQVTimperative.g:100:10: '['
+            // InternalQVTimperative.g:100:8: ( '<-' )
+            // InternalQVTimperative.g:100:10: '<-'
             {
-            match('['); 
+            match("<-"); 
+
 
             }
 
@@ -2049,10 +2056,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__107;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:101:8: ( ']' )
-            // InternalQVTimperative.g:101:10: ']'
+            // InternalQVTimperative.g:101:8: ( 'invalid' )
+            // InternalQVTimperative.g:101:10: 'invalid'
             {
-            match(']'); 
+            match("invalid"); 
+
 
             }
 
@@ -2069,10 +2077,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__108;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:102:8: ( 'if' )
-            // InternalQVTimperative.g:102:10: 'if'
+            // InternalQVTimperative.g:102:8: ( 'null' )
+            // InternalQVTimperative.g:102:10: 'null'
             {
-            match("if"); 
+            match("null"); 
 
 
             }
@@ -2090,10 +2098,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__109;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:103:8: ( 'then' )
-            // InternalQVTimperative.g:103:10: 'then'
+            // InternalQVTimperative.g:103:8: ( 'pre' )
+            // InternalQVTimperative.g:103:10: 'pre'
             {
-            match("then"); 
+            match("pre"); 
 
 
             }
@@ -2111,11 +2119,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__110;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:104:8: ( 'else' )
-            // InternalQVTimperative.g:104:10: 'else'
+            // InternalQVTimperative.g:104:8: ( '[' )
+            // InternalQVTimperative.g:104:10: '['
             {
-            match("else"); 
-
+            match('['); 
 
             }
 
@@ -2132,11 +2139,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__111;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:105:8: ( 'endif' )
-            // InternalQVTimperative.g:105:10: 'endif'
+            // InternalQVTimperative.g:105:8: ( ']' )
+            // InternalQVTimperative.g:105:10: ']'
             {
-            match("endif"); 
-
+            match(']'); 
 
             }
 
@@ -2153,10 +2159,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__112;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:106:8: ( 'elseif' )
-            // InternalQVTimperative.g:106:10: 'elseif'
+            // InternalQVTimperative.g:106:8: ( 'if' )
+            // InternalQVTimperative.g:106:10: 'if'
             {
-            match("elseif"); 
+            match("if"); 
 
 
             }
@@ -2174,10 +2180,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__113;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:107:8: ( 'let' )
-            // InternalQVTimperative.g:107:10: 'let'
+            // InternalQVTimperative.g:107:8: ( 'then' )
+            // InternalQVTimperative.g:107:10: 'then'
             {
-            match("let"); 
+            match("then"); 
 
 
             }
@@ -2195,10 +2201,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__114;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:108:8: ( 'self' )
-            // InternalQVTimperative.g:108:10: 'self'
+            // InternalQVTimperative.g:108:8: ( 'else' )
+            // InternalQVTimperative.g:108:10: 'else'
             {
-            match("self"); 
+            match("else"); 
 
 
             }
@@ -2216,10 +2222,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__115;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:109:8: ( '&&' )
-            // InternalQVTimperative.g:109:10: '&&'
+            // InternalQVTimperative.g:109:8: ( 'endif' )
+            // InternalQVTimperative.g:109:10: 'endif'
             {
-            match("&&"); 
+            match("endif"); 
 
 
             }
@@ -2237,10 +2243,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__116;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:110:8: ( 'infinite' )
-            // InternalQVTimperative.g:110:10: 'infinite'
+            // InternalQVTimperative.g:110:8: ( 'elseif' )
+            // InternalQVTimperative.g:110:10: 'elseif'
             {
-            match("infinite"); 
+            match("elseif"); 
 
 
             }
@@ -2258,10 +2264,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__117;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:111:8: ( 'transient' )
-            // InternalQVTimperative.g:111:10: 'transient'
+            // InternalQVTimperative.g:111:8: ( 'let' )
+            // InternalQVTimperative.g:111:10: 'let'
             {
-            match("transient"); 
+            match("let"); 
 
 
             }
@@ -2279,10 +2285,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__118;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:112:8: ( 'notify' )
-            // InternalQVTimperative.g:112:10: 'notify'
+            // InternalQVTimperative.g:112:8: ( 'self' )
+            // InternalQVTimperative.g:112:10: 'self'
             {
-            match("notify"); 
+            match("self"); 
 
 
             }
@@ -2300,10 +2306,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__119;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:113:8: ( 'static' )
-            // InternalQVTimperative.g:113:10: 'static'
+            // InternalQVTimperative.g:113:8: ( '&&' )
+            // InternalQVTimperative.g:113:10: '&&'
             {
-            match("static"); 
+            match("&&"); 
 
 
             }
@@ -2321,10 +2327,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__120;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:114:8: ( 'definition' )
-            // InternalQVTimperative.g:114:10: 'definition'
+            // InternalQVTimperative.g:114:8: ( 'infinite' )
+            // InternalQVTimperative.g:114:10: 'infinite'
             {
-            match("definition"); 
+            match("infinite"); 
 
 
             }
@@ -2342,10 +2348,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__121;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:115:8: ( 'derived' )
-            // InternalQVTimperative.g:115:10: 'derived'
+            // InternalQVTimperative.g:115:8: ( 'install' )
+            // InternalQVTimperative.g:115:10: 'install'
             {
-            match("derived"); 
+            match("install"); 
 
 
             }
@@ -2363,10 +2369,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__122;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:116:8: ( '!derived' )
-            // InternalQVTimperative.g:116:10: '!derived'
+            // InternalQVTimperative.g:116:8: ( 'invoke' )
+            // InternalQVTimperative.g:116:10: 'invoke'
             {
-            match("!derived"); 
+            match("invoke"); 
 
 
             }
@@ -2384,10 +2390,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__123;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:117:8: ( 'id' )
-            // InternalQVTimperative.g:117:10: 'id'
+            // InternalQVTimperative.g:117:8: ( 'transient' )
+            // InternalQVTimperative.g:117:10: 'transient'
             {
-            match("id"); 
+            match("transient"); 
 
 
             }
@@ -2405,10 +2411,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__124;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:118:8: ( '!id' )
-            // InternalQVTimperative.g:118:10: '!id'
+            // InternalQVTimperative.g:118:8: ( 'notify' )
+            // InternalQVTimperative.g:118:10: 'notify'
             {
-            match("!id"); 
+            match("notify"); 
 
 
             }
@@ -2426,10 +2432,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__125;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:119:8: ( 'ordered' )
-            // InternalQVTimperative.g:119:10: 'ordered'
+            // InternalQVTimperative.g:119:8: ( 'static' )
+            // InternalQVTimperative.g:119:10: 'static'
             {
-            match("ordered"); 
+            match("static"); 
 
 
             }
@@ -2447,10 +2453,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__126;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:120:8: ( '!ordered' )
-            // InternalQVTimperative.g:120:10: '!ordered'
+            // InternalQVTimperative.g:120:8: ( 'definition' )
+            // InternalQVTimperative.g:120:10: 'definition'
             {
-            match("!ordered"); 
+            match("definition"); 
 
 
             }
@@ -2468,10 +2474,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__127;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:121:8: ( 'readonly' )
-            // InternalQVTimperative.g:121:10: 'readonly'
+            // InternalQVTimperative.g:121:8: ( 'derived' )
+            // InternalQVTimperative.g:121:10: 'derived'
             {
-            match("readonly"); 
+            match("derived"); 
 
 
             }
@@ -2489,10 +2495,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__128;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:122:8: ( '!readonly' )
-            // InternalQVTimperative.g:122:10: '!readonly'
+            // InternalQVTimperative.g:122:8: ( '!derived' )
+            // InternalQVTimperative.g:122:10: '!derived'
             {
-            match("!readonly"); 
+            match("!derived"); 
 
 
             }
@@ -2510,10 +2516,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__129;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:123:8: ( '!transient' )
-            // InternalQVTimperative.g:123:10: '!transient'
+            // InternalQVTimperative.g:123:8: ( 'id' )
+            // InternalQVTimperative.g:123:10: 'id'
             {
-            match("!transient"); 
+            match("id"); 
 
 
             }
@@ -2531,10 +2537,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__130;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:124:8: ( 'unique' )
-            // InternalQVTimperative.g:124:10: 'unique'
+            // InternalQVTimperative.g:124:8: ( '!id' )
+            // InternalQVTimperative.g:124:10: '!id'
             {
-            match("unique"); 
+            match("!id"); 
 
 
             }
@@ -2552,10 +2558,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__131;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:125:8: ( '!unique' )
-            // InternalQVTimperative.g:125:10: '!unique'
+            // InternalQVTimperative.g:125:8: ( 'ordered' )
+            // InternalQVTimperative.g:125:10: 'ordered'
             {
-            match("!unique"); 
+            match("ordered"); 
 
 
             }
@@ -2573,10 +2579,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__132;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:126:8: ( 'unsettable' )
-            // InternalQVTimperative.g:126:10: 'unsettable'
+            // InternalQVTimperative.g:126:8: ( '!ordered' )
+            // InternalQVTimperative.g:126:10: '!ordered'
             {
-            match("unsettable"); 
+            match("!ordered"); 
 
 
             }
@@ -2594,10 +2600,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__133;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:127:8: ( '!unsettable' )
-            // InternalQVTimperative.g:127:10: '!unsettable'
+            // InternalQVTimperative.g:127:8: ( 'readonly' )
+            // InternalQVTimperative.g:127:10: 'readonly'
             {
-            match("!unsettable"); 
+            match("readonly"); 
 
 
             }
@@ -2615,10 +2621,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__134;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:128:8: ( 'volatile' )
-            // InternalQVTimperative.g:128:10: 'volatile'
+            // InternalQVTimperative.g:128:8: ( '!readonly' )
+            // InternalQVTimperative.g:128:10: '!readonly'
             {
-            match("volatile"); 
+            match("!readonly"); 
 
 
             }
@@ -2636,10 +2642,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__135;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:129:8: ( '!volatile' )
-            // InternalQVTimperative.g:129:10: '!volatile'
+            // InternalQVTimperative.g:129:8: ( '!transient' )
+            // InternalQVTimperative.g:129:10: '!transient'
             {
-            match("!volatile"); 
+            match("!transient"); 
 
 
             }
@@ -2657,10 +2663,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__136;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:130:8: ( 'primitive' )
-            // InternalQVTimperative.g:130:10: 'primitive'
+            // InternalQVTimperative.g:130:8: ( 'unique' )
+            // InternalQVTimperative.g:130:10: 'unique'
             {
-            match("primitive"); 
+            match("unique"); 
 
 
             }
@@ -2678,10 +2684,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__137;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:131:8: ( 'serializable' )
-            // InternalQVTimperative.g:131:10: 'serializable'
+            // InternalQVTimperative.g:131:8: ( '!unique' )
+            // InternalQVTimperative.g:131:10: '!unique'
             {
-            match("serializable"); 
+            match("!unique"); 
 
 
             }
@@ -2699,10 +2705,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__138;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:132:8: ( 'composes' )
-            // InternalQVTimperative.g:132:10: 'composes'
+            // InternalQVTimperative.g:132:8: ( 'unsettable' )
+            // InternalQVTimperative.g:132:10: 'unsettable'
             {
-            match("composes"); 
+            match("unsettable"); 
 
 
             }
@@ -2720,10 +2726,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__139;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:133:8: ( '!composes' )
-            // InternalQVTimperative.g:133:10: '!composes'
+            // InternalQVTimperative.g:133:8: ( '!unsettable' )
+            // InternalQVTimperative.g:133:10: '!unsettable'
             {
-            match("!composes"); 
+            match("!unsettable"); 
 
 
             }
@@ -2741,10 +2747,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__140;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:134:8: ( 'resolve' )
-            // InternalQVTimperative.g:134:10: 'resolve'
+            // InternalQVTimperative.g:134:8: ( 'volatile' )
+            // InternalQVTimperative.g:134:10: 'volatile'
             {
-            match("resolve"); 
+            match("volatile"); 
 
 
             }
@@ -2762,10 +2768,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__141;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:135:8: ( '!resolve' )
-            // InternalQVTimperative.g:135:10: '!resolve'
+            // InternalQVTimperative.g:135:8: ( '!volatile' )
+            // InternalQVTimperative.g:135:10: '!volatile'
             {
-            match("!resolve"); 
+            match("!volatile"); 
 
 
             }
@@ -2783,10 +2789,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__142;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:136:8: ( 'abstract' )
-            // InternalQVTimperative.g:136:10: 'abstract'
+            // InternalQVTimperative.g:136:8: ( 'primitive' )
+            // InternalQVTimperative.g:136:10: 'primitive'
             {
-            match("abstract"); 
+            match("primitive"); 
 
 
             }
@@ -2804,10 +2810,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__143;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:137:8: ( 'interface' )
-            // InternalQVTimperative.g:137:10: 'interface'
+            // InternalQVTimperative.g:137:8: ( 'serializable' )
+            // InternalQVTimperative.g:137:10: 'serializable'
             {
-            match("interface"); 
+            match("serializable"); 
 
 
             }
@@ -2825,10 +2831,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__144;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:138:8: ( 'true' )
-            // InternalQVTimperative.g:138:10: 'true'
+            // InternalQVTimperative.g:138:8: ( 'composes' )
+            // InternalQVTimperative.g:138:10: 'composes'
             {
-            match("true"); 
+            match("composes"); 
 
 
             }
@@ -2846,10 +2852,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__145;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:139:8: ( 'false' )
-            // InternalQVTimperative.g:139:10: 'false'
+            // InternalQVTimperative.g:139:8: ( '!composes' )
+            // InternalQVTimperative.g:139:10: '!composes'
             {
-            match("false"); 
+            match("!composes"); 
 
 
             }
@@ -2867,10 +2873,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__146;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:140:8: ( '@' )
-            // InternalQVTimperative.g:140:10: '@'
+            // InternalQVTimperative.g:140:8: ( 'resolve' )
+            // InternalQVTimperative.g:140:10: 'resolve'
             {
-            match('@'); 
+            match("resolve"); 
+
 
             }
 
@@ -2887,10 +2894,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__147;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:141:8: ( '|' )
-            // InternalQVTimperative.g:141:10: '|'
+            // InternalQVTimperative.g:141:8: ( '!resolve' )
+            // InternalQVTimperative.g:141:10: '!resolve'
             {
-            match('|'); 
+            match("!resolve"); 
+
 
             }
 
@@ -2907,10 +2915,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = T__148;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:142:8: ( '|1' )
-            // InternalQVTimperative.g:142:10: '|1'
+            // InternalQVTimperative.g:142:8: ( 'abstract' )
+            // InternalQVTimperative.g:142:10: 'abstract'
             {
-            match("|1"); 
+            match("abstract"); 
 
 
             }
@@ -2923,13 +2931,137 @@ public class InternalQVTimperativeLexer extends Lexer {
     }
     // $ANTLR end "T__148"
 
+    // $ANTLR start "T__149"
+    public final void mT__149() throws RecognitionException {
+        try {
+            int _type = T__149;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalQVTimperative.g:143:8: ( 'interface' )
+            // InternalQVTimperative.g:143:10: 'interface'
+            {
+            match("interface"); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__149"
+
+    // $ANTLR start "T__150"
+    public final void mT__150() throws RecognitionException {
+        try {
+            int _type = T__150;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalQVTimperative.g:144:8: ( 'true' )
+            // InternalQVTimperative.g:144:10: 'true'
+            {
+            match("true"); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__150"
+
+    // $ANTLR start "T__151"
+    public final void mT__151() throws RecognitionException {
+        try {
+            int _type = T__151;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalQVTimperative.g:145:8: ( 'false' )
+            // InternalQVTimperative.g:145:10: 'false'
+            {
+            match("false"); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__151"
+
+    // $ANTLR start "T__152"
+    public final void mT__152() throws RecognitionException {
+        try {
+            int _type = T__152;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalQVTimperative.g:146:8: ( '@' )
+            // InternalQVTimperative.g:146:10: '@'
+            {
+            match('@'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__152"
+
+    // $ANTLR start "T__153"
+    public final void mT__153() throws RecognitionException {
+        try {
+            int _type = T__153;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalQVTimperative.g:147:8: ( '|' )
+            // InternalQVTimperative.g:147:10: '|'
+            {
+            match('|'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__153"
+
+    // $ANTLR start "T__154"
+    public final void mT__154() throws RecognitionException {
+        try {
+            int _type = T__154;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalQVTimperative.g:148:8: ( '|1' )
+            // InternalQVTimperative.g:148:10: '|1'
+            {
+            match("|1"); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__154"
+
     // $ANTLR start "RULE_UNQUOTED_STRING"
     public final void mRULE_UNQUOTED_STRING() throws RecognitionException {
         try {
             int _type = RULE_UNQUOTED_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:30498:22: ( '\\u00A3$%^\\u00A3$%^' )
-            // InternalQVTimperative.g:30498:24: '\\u00A3$%^\\u00A3$%^'
+            // InternalQVTimperative.g:31712:22: ( '\\u00A3$%^\\u00A3$%^' )
+            // InternalQVTimperative.g:31712:24: '\\u00A3$%^\\u00A3$%^'
             {
             match("\u00A3$%^\u00A3$%^"); 
 
@@ -2947,8 +3079,8 @@ public class InternalQVTimperativeLexer extends Lexer {
     // $ANTLR start "RULE_ESCAPED_CHARACTER"
     public final void mRULE_ESCAPED_CHARACTER() throws RecognitionException {
         try {
-            // InternalQVTimperative.g:30500:33: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) )
-            // InternalQVTimperative.g:30500:35: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
+            // InternalQVTimperative.g:31714:33: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) )
+            // InternalQVTimperative.g:31714:35: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' )
             {
             match('\\'); 
             if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {
@@ -2972,8 +3104,8 @@ public class InternalQVTimperativeLexer extends Lexer {
     // $ANTLR start "RULE_LETTER_CHARACTER"
     public final void mRULE_LETTER_CHARACTER() throws RecognitionException {
         try {
-            // InternalQVTimperative.g:30502:32: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) )
-            // InternalQVTimperative.g:30502:34: ( 'a' .. 'z' | 'A' .. 'Z' | '_' )
+            // InternalQVTimperative.g:31716:32: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) )
+            // InternalQVTimperative.g:31716:34: ( 'a' .. 'z' | 'A' .. 'Z' | '_' )
             {
             if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
                 input.consume();
@@ -2998,11 +3130,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = RULE_DOUBLE_QUOTED_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:30504:27: ( '\"' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
-            // InternalQVTimperative.g:30504:29: '\"' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+            // InternalQVTimperative.g:31718:27: ( '\"' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
+            // InternalQVTimperative.g:31718:29: '\"' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
             {
             match('\"'); 
-            // InternalQVTimperative.g:30504:33: ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )*
+            // InternalQVTimperative.g:31718:33: ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )*
             loop1:
             do {
                 int alt1=3;
@@ -3018,14 +3150,14 @@ public class InternalQVTimperativeLexer extends Lexer {
 
                 switch (alt1) {
             	case 1 :
-            	    // InternalQVTimperative.g:30504:34: RULE_ESCAPED_CHARACTER
+            	    // InternalQVTimperative.g:31718:34: RULE_ESCAPED_CHARACTER
             	    {
             	    mRULE_ESCAPED_CHARACTER(); 
 
             	    }
             	    break;
             	case 2 :
-            	    // InternalQVTimperative.g:30504:57: ~ ( ( '\\\\' | '\"' ) )
+            	    // InternalQVTimperative.g:31718:57: ~ ( ( '\\\\' | '\"' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -3062,11 +3194,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = RULE_SINGLE_QUOTED_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:30506:27: ( '\\'' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            // InternalQVTimperative.g:30506:29: '\\'' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+            // InternalQVTimperative.g:31720:27: ( '\\'' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalQVTimperative.g:31720:29: '\\'' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
             {
             match('\''); 
-            // InternalQVTimperative.g:30506:34: ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )*
+            // InternalQVTimperative.g:31720:34: ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )*
             loop2:
             do {
                 int alt2=3;
@@ -3082,14 +3214,14 @@ public class InternalQVTimperativeLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // InternalQVTimperative.g:30506:35: RULE_ESCAPED_CHARACTER
+            	    // InternalQVTimperative.g:31720:35: RULE_ESCAPED_CHARACTER
             	    {
             	    mRULE_ESCAPED_CHARACTER(); 
 
             	    }
             	    break;
             	case 2 :
-            	    // InternalQVTimperative.g:30506:58: ~ ( ( '\\\\' | '\\'' ) )
+            	    // InternalQVTimperative.g:31720:58: ~ ( ( '\\\\' | '\\'' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -3126,12 +3258,12 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = RULE_ML_SINGLE_QUOTED_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:30508:30: ( '/\\'' ( options {greedy=false; } : . )* '\\'/' )
-            // InternalQVTimperative.g:30508:32: '/\\'' ( options {greedy=false; } : . )* '\\'/'
+            // InternalQVTimperative.g:31722:30: ( '/\\'' ( options {greedy=false; } : . )* '\\'/' )
+            // InternalQVTimperative.g:31722:32: '/\\'' ( options {greedy=false; } : . )* '\\'/'
             {
             match("/'"); 
 
-            // InternalQVTimperative.g:30508:38: ( options {greedy=false; } : . )*
+            // InternalQVTimperative.g:31722:38: ( options {greedy=false; } : . )*
             loop3:
             do {
                 int alt3=2;
@@ -3156,7 +3288,7 @@ public class InternalQVTimperativeLexer extends Lexer {
 
                 switch (alt3) {
             	case 1 :
-            	    // InternalQVTimperative.g:30508:66: .
+            	    // InternalQVTimperative.g:31722:66: .
             	    {
             	    matchAny(); 
 
@@ -3186,11 +3318,11 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = RULE_SIMPLE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:30510:16: ( RULE_LETTER_CHARACTER ( RULE_LETTER_CHARACTER | '0' .. '9' )* )
-            // InternalQVTimperative.g:30510:18: RULE_LETTER_CHARACTER ( RULE_LETTER_CHARACTER | '0' .. '9' )*
+            // InternalQVTimperative.g:31724:16: ( RULE_LETTER_CHARACTER ( RULE_LETTER_CHARACTER | '0' .. '9' )* )
+            // InternalQVTimperative.g:31724:18: RULE_LETTER_CHARACTER ( RULE_LETTER_CHARACTER | '0' .. '9' )*
             {
             mRULE_LETTER_CHARACTER(); 
-            // InternalQVTimperative.g:30510:40: ( RULE_LETTER_CHARACTER | '0' .. '9' )*
+            // InternalQVTimperative.g:31724:40: ( RULE_LETTER_CHARACTER | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -3239,8 +3371,8 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = RULE_ESCAPED_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:30512:17: ( '_' RULE_SINGLE_QUOTED_STRING )
-            // InternalQVTimperative.g:30512:19: '_' RULE_SINGLE_QUOTED_STRING
+            // InternalQVTimperative.g:31726:17: ( '_' RULE_SINGLE_QUOTED_STRING )
+            // InternalQVTimperative.g:31726:19: '_' RULE_SINGLE_QUOTED_STRING
             {
             match('_'); 
             mRULE_SINGLE_QUOTED_STRING(); 
@@ -3260,10 +3392,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:30514:10: ( ( '0' .. '9' )+ )
-            // InternalQVTimperative.g:30514:12: ( '0' .. '9' )+
+            // InternalQVTimperative.g:31728:10: ( ( '0' .. '9' )+ )
+            // InternalQVTimperative.g:31728:12: ( '0' .. '9' )+
             {
-            // InternalQVTimperative.g:30514:12: ( '0' .. '9' )+
+            // InternalQVTimperative.g:31728:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -3277,7 +3409,7 @@ public class InternalQVTimperativeLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // InternalQVTimperative.g:30514:13: '0' .. '9'
+            	    // InternalQVTimperative.g:31728:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -3309,12 +3441,12 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:30516:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalQVTimperative.g:30516:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalQVTimperative.g:31730:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalQVTimperative.g:31730:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalQVTimperative.g:30516:24: ( options {greedy=false; } : . )*
+            // InternalQVTimperative.g:31730:24: ( options {greedy=false; } : . )*
             loop6:
             do {
                 int alt6=2;
@@ -3339,7 +3471,7 @@ public class InternalQVTimperativeLexer extends Lexer {
 
                 switch (alt6) {
             	case 1 :
-            	    // InternalQVTimperative.g:30516:52: .
+            	    // InternalQVTimperative.g:31730:52: .
             	    {
             	    matchAny(); 
 
@@ -3369,12 +3501,12 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:30518:17: ( '--' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalQVTimperative.g:30518:19: '--' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalQVTimperative.g:31732:17: ( '--' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalQVTimperative.g:31732:19: '--' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("--"); 
 
-            // InternalQVTimperative.g:30518:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalQVTimperative.g:31732:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop7:
             do {
                 int alt7=2;
@@ -3387,7 +3519,7 @@ public class InternalQVTimperativeLexer extends Lexer {
 
                 switch (alt7) {
             	case 1 :
-            	    // InternalQVTimperative.g:30518:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalQVTimperative.g:31732:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -3407,7 +3539,7 @@ public class InternalQVTimperativeLexer extends Lexer {
                 }
             } while (true);
 
-            // InternalQVTimperative.g:30518:40: ( ( '\\r' )? '\\n' )?
+            // InternalQVTimperative.g:31732:40: ( ( '\\r' )? '\\n' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -3416,9 +3548,9 @@ public class InternalQVTimperativeLexer extends Lexer {
             }
             switch (alt9) {
                 case 1 :
-                    // InternalQVTimperative.g:30518:41: ( '\\r' )? '\\n'
+                    // InternalQVTimperative.g:31732:41: ( '\\r' )? '\\n'
                     {
-                    // InternalQVTimperative.g:30518:41: ( '\\r' )?
+                    // InternalQVTimperative.g:31732:41: ( '\\r' )?
                     int alt8=2;
                     int LA8_0 = input.LA(1);
 
@@ -3427,7 +3559,7 @@ public class InternalQVTimperativeLexer extends Lexer {
                     }
                     switch (alt8) {
                         case 1 :
-                            // InternalQVTimperative.g:30518:41: '\\r'
+                            // InternalQVTimperative.g:31732:41: '\\r'
                             {
                             match('\r'); 
 
@@ -3459,10 +3591,10 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:30520:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalQVTimperative.g:30520:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalQVTimperative.g:31734:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalQVTimperative.g:31734:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalQVTimperative.g:30520:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalQVTimperative.g:31734:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt10=0;
             loop10:
             do {
@@ -3516,8 +3648,8 @@ public class InternalQVTimperativeLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalQVTimperative.g:30522:16: ( . )
-            // InternalQVTimperative.g:30522:18: .
+            // InternalQVTimperative.g:31736:16: ( . )
+            // InternalQVTimperative.g:31736:18: .
             {
             matchAny(); 
 
@@ -3532,8 +3664,8 @@ public class InternalQVTimperativeLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // InternalQVTimperative.g:1:8: ( T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | T__135 | T__136 | T__137 | T__138 | T__139 | T__140 | T__141 | T__142 | T__143 | T__144 | T__145 | T__146 | T__147 | T__148 | RULE_UNQUOTED_STRING | RULE_DOUBLE_QUOTED_STRING | RULE_SINGLE_QUOTED_STRING | RULE_ML_SINGLE_QUOTED_STRING | RULE_SIMPLE_ID | RULE_ESCAPED_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt11=143;
+        // InternalQVTimperative.g:1:8: ( T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | T__135 | T__136 | T__137 | T__138 | T__139 | T__140 | T__141 | T__142 | T__143 | T__144 | T__145 | T__146 | T__147 | T__148 | T__149 | T__150 | T__151 | T__152 | T__153 | T__154 | RULE_UNQUOTED_STRING | RULE_DOUBLE_QUOTED_STRING | RULE_SINGLE_QUOTED_STRING | RULE_ML_SINGLE_QUOTED_STRING | RULE_SIMPLE_ID | RULE_ESCAPED_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt11=149;
         alt11 = dfa11.predict(input);
         switch (alt11) {
             case 1 :
@@ -4461,77 +4593,119 @@ public class InternalQVTimperativeLexer extends Lexer {
                 }
                 break;
             case 133 :
-                // InternalQVTimperative.g:1:851: RULE_UNQUOTED_STRING
+                // InternalQVTimperative.g:1:851: T__149
                 {
-                mRULE_UNQUOTED_STRING(); 
+                mT__149(); 
 
                 }
                 break;
             case 134 :
-                // InternalQVTimperative.g:1:872: RULE_DOUBLE_QUOTED_STRING
+                // InternalQVTimperative.g:1:858: T__150
                 {
-                mRULE_DOUBLE_QUOTED_STRING(); 
+                mT__150(); 
 
                 }
                 break;
             case 135 :
-                // InternalQVTimperative.g:1:898: RULE_SINGLE_QUOTED_STRING
+                // InternalQVTimperative.g:1:865: T__151
                 {
-                mRULE_SINGLE_QUOTED_STRING(); 
+                mT__151(); 
 
                 }
                 break;
             case 136 :
-                // InternalQVTimperative.g:1:924: RULE_ML_SINGLE_QUOTED_STRING
+                // InternalQVTimperative.g:1:872: T__152
                 {
-                mRULE_ML_SINGLE_QUOTED_STRING(); 
+                mT__152(); 
 
                 }
                 break;
             case 137 :
-                // InternalQVTimperative.g:1:953: RULE_SIMPLE_ID
+                // InternalQVTimperative.g:1:879: T__153
                 {
-                mRULE_SIMPLE_ID(); 
+                mT__153(); 
 
                 }
                 break;
             case 138 :
-                // InternalQVTimperative.g:1:968: RULE_ESCAPED_ID
+                // InternalQVTimperative.g:1:886: T__154
                 {
-                mRULE_ESCAPED_ID(); 
+                mT__154(); 
 
                 }
                 break;
             case 139 :
-                // InternalQVTimperative.g:1:984: RULE_INT
+                // InternalQVTimperative.g:1:893: RULE_UNQUOTED_STRING
                 {
-                mRULE_INT(); 
+                mRULE_UNQUOTED_STRING(); 
 
                 }
                 break;
             case 140 :
-                // InternalQVTimperative.g:1:993: RULE_ML_COMMENT
+                // InternalQVTimperative.g:1:914: RULE_DOUBLE_QUOTED_STRING
                 {
-                mRULE_ML_COMMENT(); 
+                mRULE_DOUBLE_QUOTED_STRING(); 
 
                 }
                 break;
             case 141 :
-                // InternalQVTimperative.g:1:1009: RULE_SL_COMMENT
+                // InternalQVTimperative.g:1:940: RULE_SINGLE_QUOTED_STRING
                 {
-                mRULE_SL_COMMENT(); 
+                mRULE_SINGLE_QUOTED_STRING(); 
 
                 }
                 break;
             case 142 :
-                // InternalQVTimperative.g:1:1025: RULE_WS
+                // InternalQVTimperative.g:1:966: RULE_ML_SINGLE_QUOTED_STRING
                 {
-                mRULE_WS(); 
+                mRULE_ML_SINGLE_QUOTED_STRING(); 
 
                 }
                 break;
             case 143 :
-                // InternalQVTimperative.g:1:1033: RULE_ANY_OTHER
+                // InternalQVTimperative.g:1:995: RULE_SIMPLE_ID
+                {
+                mRULE_SIMPLE_ID(); 
+
+                }
+                break;
+            case 144 :
+                // InternalQVTimperative.g:1:1010: RULE_ESCAPED_ID
+                {
+                mRULE_ESCAPED_ID(); 
+
+                }
+                break;
+            case 145 :
+                // InternalQVTimperative.g:1:1026: RULE_INT
+                {
+                mRULE_INT(); 
+
+                }
+                break;
+            case 146 :
+                // InternalQVTimperative.g:1:1035: RULE_ML_COMMENT
+                {
+                mRULE_ML_COMMENT(); 
+
+                }
+                break;
+            case 147 :
+                // InternalQVTimperative.g:1:1051: RULE_SL_COMMENT
+                {
+                mRULE_SL_COMMENT(); 
+
+                }
+                break;
+            case 148 :
+                // InternalQVTimperative.g:1:1067: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 149 :
+                // InternalQVTimperative.g:1:1075: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -4545,116 +4719,118 @@ public class InternalQVTimperativeLexer extends Lexer {
 
     protected DFA11 dfa11 = new DFA11(this);
     static final String DFA11_eotS =
-        "\2\uffff\11\102\1\74\1\136\1\102\1\uffff\1\145\1\150\1\152\1\156\1\uffff\3\102\1\173\1\176\11\102\1\u008d\1\uffff\1\u0091\1\102\2\uffff\2\102\2\uffff\3\102\1\uffff\1\102\2\uffff\1\74\1\uffff\3\74\1\102\5\uffff\4\102\1\uffff\4\102\1\u00bb\1\u00bc\1\u00bd\11\102\14\uffff\3\102\16\uffff\5\102\1\u00d8\4\102\5\uffff\14\102\7\uffff\2\102\2\uffff\4\102\2\uffff\5\102\1\uffff\1\102\12\uffff\16\102\3\uffff\2\102\1\u010c\1\u010d\13\102\2\uffff\1\u011f\1\u0120\1\102\1\u0122\1\u0123\4\102\1\uffff\1\102\1\u0129\1\102\1\u012b\1\u012c\2\102\1\u012f\3\102\1\u0133\5\102\1\u013b\1\102\1\u013d\3\102\1\u0141\1\102\1\u0143\11\102\1\u014d\3\102\1\u0151\2\102\1\u0155\10\102\2\uffff\6\102\1\u0164\1\102\1\u0166\1\u0167\2\102\4\uffff\1\102\2\uffff\1\u016b\2\uffff\5\102\1\uffff\1\102\2\uffff\2\102\1\uffff\1\102\1\u0175\1\102\1\uffff\7\102\1\uffff\1\102\1\uffff\3\102\1\uffff\1\102\1\uffff\1\u0183\5\102\1\u0189\1\102\1\u018b\1\uffff\1\u018c\2\102\1\uffff\1\u018f\2\102\1\uffff\10\102\1\u019a\5\102\1\uffff\1\102\2\uffff\3\102\1\uffff\6\102\1\u01ab\2\102\1\uffff\11\102\1\u01b7\3\102\1\uffff\5\102\1\uffff\1\102\2\uffff\2\102\1\uffff\1\102\1\u01c5\1\u01c7\7\102\1\uffff\6\102\1\u01d5\1\u01d6\1\102\1\u01d8\1\u01d9\5\102\1\uffff\2\102\1\u01e1\2\102\1\u01e4\5\102\1\uffff\4\102\1\u01ee\4\102\1\u01f3\1\102\1\u01f5\1\u01f6\1\uffff\1\u01f7\1\uffff\1\u01f8\1\u01f9\1\u01fa\2\102\1\u01fd\1\u01fe\1\u01ff\1\102\1\u0201\1\u0202\2\102\2\uffff\1\102\2\uffff\2\102\1\u0208\1\u0209\1\102\1\u020b\1\u020c\1\uffff\2\102\1\uffff\1\102\1\u0210\3\102\1\u0214\3\102\1\uffff\1\102\1\u0219\2\102\1\uffff\1\u021c\6\uffff\1\u021d\1\102\3\uffff\1\u021f\2\uffff\4\102\1\u0224\2\uffff\1\102\2\uffff\1\u0226\2\102\1\uffff\2\102\1\u022b\1\uffff\1\u022c\3\102\1\uffff\1\102\1\u0231\2\uffff\1\u0232\1\uffff\1\102\1\u0234\1\102\1\u0236\1\uffff\1\u0237\1\uffff\4\102\2\uffff\1\u023c\3\102\2\uffff\1\102\1\uffff\1\u0241\2\uffff\1\102\1\u0243\1\u0244\1\u0245\1\uffff\1\102\1\u0247\1\u0248\1\102\1\uffff\1\102\3\uffff\1\102\2\uffff\2\102\1\u024e\2\102\1\uffff\1\u0251\1\102\1\uffff\1\102\1\u0254\1\uffff";
+        "\1\uffff\1\102\1\uffff\10\102\1\75\1\140\1\102\1\uffff\1\147\1\152\1\154\1\160\1\uffff\3\102\1\174\1\177\11\102\1\u008e\1\uffff\1\u0092\3\102\2\uffff\2\102\2\uffff\2\102\1\uffff\1\102\2\uffff\1\75\1\uffff\3\75\1\102\4\uffff\4\102\2\uffff\5\102\1\u00c1\1\u00c2\1\u00c3\11\102\14\uffff\3\102\16\uffff\5\102\1\u00de\3\102\5\uffff\14\102\7\uffff\5\102\2\uffff\4\102\2\uffff\4\102\1\uffff\1\102\12\uffff\21\102\3\uffff\2\102\1\u0117\1\u0118\13\102\2\uffff\1\u012a\1\u012b\1\102\1\u012d\1\u012e\4\102\1\uffff\2\102\1\u0135\1\u0136\2\102\1\u0139\3\102\1\u013d\7\102\1\u0147\2\102\1\u014a\3\102\1\u014e\1\102\1\u0150\7\102\1\u0158\5\102\1\u015e\2\102\1\u0162\13\102\2\uffff\6\102\1\u0174\1\102\1\u0176\1\u0177\2\102\4\uffff\1\102\2\uffff\1\u017b\2\uffff\6\102\2\uffff\2\102\1\uffff\1\102\1\u0185\1\102\1\uffff\10\102\1\u018f\1\uffff\2\102\1\uffff\3\102\1\uffff\1\102\1\uffff\1\u0196\6\102\1\uffff\1\u019d\2\102\1\u01a0\1\102\1\uffff\1\u01a2\2\102\1\uffff\13\102\1\u01b0\5\102\1\uffff\1\102\2\uffff\3\102\1\uffff\6\102\1\u01c1\2\102\1\uffff\11\102\1\uffff\1\102\1\u01ce\1\u01cf\3\102\1\uffff\6\102\1\uffff\2\102\1\uffff\1\102\1\uffff\1\102\1\u01de\1\u01e0\4\102\1\u01e5\5\102\1\uffff\6\102\1\u01f1\1\u01f2\1\102\1\u01f4\1\u01f6\5\102\1\uffff\2\102\1\u01fe\2\102\1\u0201\4\102\1\u0206\1\102\2\uffff\4\102\1\u020c\4\102\1\u0211\2\102\1\u0214\1\u0215\1\uffff\1\u0216\1\uffff\1\u0217\1\102\1\u0219\1\u021a\1\uffff\1\102\1\u021c\1\102\1\u021e\1\u021f\1\u0220\1\102\1\u0222\1\u0223\2\102\2\uffff\1\102\1\uffff\1\102\1\uffff\2\102\1\u022a\1\u022b\1\102\1\u022d\1\u022e\1\uffff\2\102\1\uffff\1\102\1\u0232\2\102\1\uffff\1\102\1\u0236\3\102\1\uffff\1\102\1\u023b\2\102\1\uffff\1\u023e\1\u023f\4\uffff\1\u0240\2\uffff\1\u0241\1\uffff\1\102\3\uffff\1\u0243\2\uffff\5\102\1\u0249\2\uffff\1\102\2\uffff\1\u024b\2\102\1\uffff\2\102\1\u0250\1\uffff\1\u0251\3\102\1\uffff\1\102\1\u0256\4\uffff\1\u0257\1\uffff\1\102\1\u0259\1\102\1\u025b\1\u025c\1\uffff\1\u025d\1\uffff\4\102\2\uffff\1\u0262\3\102\2\uffff\1\102\1\uffff\1\u0267\3\uffff\1\102\1\u0269\1\u026a\1\u026b\1\uffff\1\102\1\u026d\1\u026e\1\102\1\uffff\1\102\3\uffff\1\102\2\uffff\2\102\1\u0274\2\102\1\uffff\1\u0277\1\102\1\uffff\1\102\1\u027a\1\uffff";
     static final String DFA11_eofS =
-        "\u0255\uffff";
+        "\u027b\uffff";
     static final String DFA11_minS =
-        "\1\0\1\uffff\1\141\1\154\1\144\1\145\1\141\1\165\1\145\1\150\1\156\1\143\1\55\1\145\1\uffff\1\47\1\53\1\75\1\55\1\uffff\2\142\1\157\1\56\1\55\1\141\1\165\1\141\1\156\2\145\1\156\1\143\1\157\1\61\1\uffff\1\72\1\141\2\uffff\2\141\2\uffff\1\145\1\141\1\157\1\uffff\1\141\2\uffff\1\46\1\uffff\1\44\2\0\1\47\5\uffff\1\145\1\154\1\141\1\155\1\uffff\1\144\1\164\1\163\1\160\3\60\1\142\1\164\1\160\1\145\2\141\2\145\1\151\4\uffff\1\145\1\uffff\1\156\5\uffff\1\164\1\167\1\154\16\uffff\2\144\1\160\1\164\1\163\1\60\1\163\1\164\1\145\1\162\5\uffff\2\160\1\157\1\147\1\164\1\141\1\162\1\161\2\154\1\144\1\154\7\uffff\1\162\1\154\2\uffff\1\162\1\154\1\143\1\145\2\uffff\1\154\1\141\1\146\1\164\1\144\1\uffff\1\155\12\uffff\1\143\1\154\1\163\1\160\1\157\1\155\1\151\2\145\1\154\1\164\1\141\1\151\1\145\3\uffff\1\162\1\145\2\60\1\162\1\144\1\151\1\157\1\156\1\145\1\157\1\156\1\163\1\161\1\145\1\141\1\151\2\60\1\154\2\60\1\145\1\162\1\164\1\145\1\uffff\1\145\1\60\1\162\2\60\2\154\1\60\1\145\1\154\1\151\1\60\1\165\1\151\1\101\1\145\1\154\1\60\1\141\1\60\1\163\1\153\1\160\1\60\1\155\1\60\1\146\1\151\1\164\2\151\1\141\1\171\1\142\1\153\1\60\1\163\1\157\1\162\1\60\1\146\1\156\1\60\1\162\2\151\1\154\1\156\1\162\1\141\1\162\2\uffff\1\171\1\151\1\157\1\156\1\154\1\163\1\60\1\167\2\60\1\165\1\164\4\uffff\1\146\2\uffff\1\60\2\uffff\1\156\1\151\3\162\1\uffff\1\141\2\uffff\2\145\1\uffff\1\147\1\60\1\156\1\uffff\1\145\1\155\2\156\1\157\1\162\1\145\1\uffff\1\164\1\uffff\1\145\1\141\1\145\1\uffff\1\151\1\uffff\1\60\1\141\1\151\1\166\1\156\1\164\1\60\1\144\1\60\1\uffff\1\60\1\163\1\143\1\uffff\1\60\1\144\1\146\1\uffff\1\164\1\145\1\141\2\151\1\146\1\162\1\141\1\60\1\172\1\156\1\145\1\166\1\146\1\uffff\1\163\2\uffff\1\145\1\164\1\171\1\uffff\1\144\1\142\1\141\1\145\1\166\1\164\1\60\1\141\1\145\1\uffff\1\147\1\156\1\151\1\171\1\166\1\151\1\145\1\143\1\151\1\60\1\147\1\162\1\164\1\uffff\1\154\1\143\1\141\1\151\1\171\1\uffff\1\141\2\uffff\2\145\1\uffff\1\163\2\60\1\163\1\154\1\144\1\164\1\141\1\171\1\154\1\uffff\1\145\1\154\1\163\1\145\1\157\1\145\2\60\1\141\2\60\1\165\1\143\1\144\1\145\1\151\1\uffff\1\156\1\162\1\60\1\143\1\164\1\60\1\141\2\144\1\164\1\154\1\uffff\1\145\1\164\2\151\1\60\1\164\1\144\1\164\1\160\1\60\1\163\2\60\1\uffff\1\60\1\uffff\3\60\1\145\1\143\3\60\1\171\2\60\1\162\1\156\2\uffff\1\142\2\uffff\2\164\2\60\1\157\2\60\1\uffff\2\145\1\uffff\1\154\1\60\1\123\1\151\1\145\1\60\1\171\1\166\1\172\1\uffff\1\151\1\60\1\151\1\145\1\uffff\1\60\6\uffff\1\60\1\145\3\uffff\1\60\2\uffff\1\155\1\164\1\154\1\145\1\60\2\uffff\1\156\2\uffff\1\60\1\144\1\151\1\uffff\1\145\1\157\1\60\1\uffff\1\60\1\145\1\141\1\157\1\uffff\1\157\1\60\2\uffff\1\60\1\uffff\1\141\1\60\1\145\1\60\1\uffff\1\60\1\uffff\1\116\1\144\1\164\1\156\2\uffff\1\60\1\142\2\156\2\uffff\1\164\1\uffff\1\60\2\uffff\1\141\3\60\1\uffff\1\154\2\60\1\151\1\uffff\1\164\3\uffff\1\145\2\uffff\1\157\1\165\1\60\1\156\1\162\1\uffff\1\60\1\141\1\uffff\1\154\1\60\1\uffff";
+        "\1\0\1\141\1\uffff\1\154\1\144\1\145\1\141\1\165\1\145\1\150\1\156\1\143\1\55\1\145\1\uffff\1\47\1\53\1\75\1\55\1\uffff\2\142\1\157\1\56\1\55\1\141\1\165\1\141\1\156\2\145\1\156\1\143\1\157\1\61\1\uffff\1\72\1\157\1\141\1\165\2\uffff\2\141\2\uffff\1\145\1\141\1\uffff\1\141\2\uffff\1\46\1\uffff\1\44\2\0\1\47\4\uffff\1\154\1\145\1\155\1\141\2\uffff\1\144\1\164\1\163\1\160\1\145\3\60\1\142\1\164\1\160\1\145\2\141\2\145\1\151\4\uffff\1\145\1\uffff\1\156\5\uffff\1\164\1\167\1\154\16\uffff\2\144\1\160\1\164\1\163\1\60\1\163\1\145\1\162\5\uffff\2\160\1\157\1\147\1\164\1\141\1\162\1\161\2\154\1\144\1\154\7\uffff\1\146\1\144\1\162\1\154\1\141\2\uffff\1\162\1\154\1\143\1\145\2\uffff\1\154\1\141\1\146\1\164\1\uffff\1\155\12\uffff\1\154\1\143\1\163\1\160\1\163\1\157\1\155\1\151\2\145\1\154\1\162\1\164\1\141\1\151\1\164\1\145\3\uffff\1\162\1\145\2\60\1\162\1\144\1\151\1\157\1\156\1\145\1\157\1\156\1\163\1\161\1\145\1\141\1\151\2\60\1\154\2\60\1\145\1\162\1\164\1\145\1\uffff\1\145\1\162\2\60\2\154\1\60\1\145\1\154\1\151\1\60\1\165\1\151\1\101\1\145\1\154\1\146\1\171\1\60\1\141\1\162\1\60\1\163\1\153\1\160\1\60\1\155\1\60\1\146\1\151\1\164\2\151\1\141\1\142\1\60\1\153\1\165\1\157\1\163\1\162\1\60\1\146\1\156\1\60\1\162\1\151\1\141\1\151\1\154\1\153\1\156\1\141\1\162\1\141\1\162\2\uffff\1\171\1\151\1\157\1\156\1\154\1\163\1\60\1\167\2\60\1\165\1\164\4\uffff\1\146\2\uffff\1\60\2\uffff\1\156\1\151\3\162\1\141\2\uffff\2\145\1\uffff\1\147\1\60\1\156\1\uffff\1\145\1\155\2\156\1\157\1\162\2\145\1\60\1\uffff\1\164\1\144\1\uffff\1\145\1\141\1\145\1\uffff\1\151\1\uffff\1\60\1\141\1\151\1\166\1\156\1\164\1\144\1\uffff\1\60\1\155\1\163\1\60\1\143\1\uffff\1\60\1\144\1\146\1\uffff\1\164\1\145\1\164\1\141\1\151\1\145\1\151\1\154\1\146\1\162\1\141\1\60\1\172\1\156\1\145\1\166\1\146\1\uffff\1\163\2\uffff\1\145\1\164\1\171\1\uffff\1\144\1\142\1\141\1\145\1\166\1\164\1\60\1\141\1\145\1\uffff\1\147\1\156\1\151\1\171\1\166\1\151\1\145\1\143\1\162\1\uffff\1\151\2\60\1\147\1\162\1\164\1\uffff\1\154\1\143\1\141\1\151\1\171\1\141\1\uffff\2\145\1\uffff\1\145\1\uffff\1\163\2\60\1\163\1\145\1\154\1\144\1\60\1\164\1\154\1\141\1\171\1\154\1\uffff\1\145\1\154\1\163\1\145\1\157\1\145\2\60\1\141\2\60\1\165\1\143\1\144\1\145\1\151\1\uffff\1\156\1\162\1\60\1\143\1\164\1\60\1\141\2\144\1\164\1\60\1\154\2\uffff\1\145\1\164\2\151\1\60\1\164\1\144\1\164\1\160\1\60\2\163\2\60\1\uffff\1\60\1\uffff\1\60\1\163\2\60\1\uffff\1\145\1\60\1\143\3\60\1\171\2\60\1\162\1\156\2\uffff\1\142\1\uffff\1\124\1\uffff\2\164\2\60\1\157\2\60\1\uffff\2\145\1\uffff\1\154\1\60\1\123\1\151\1\uffff\1\145\1\60\1\171\1\166\1\172\1\uffff\1\151\1\60\1\151\1\145\1\uffff\2\60\4\uffff\1\60\2\uffff\1\60\1\uffff\1\145\3\uffff\1\60\2\uffff\1\155\1\164\1\154\1\157\1\145\1\60\2\uffff\1\156\2\uffff\1\60\1\144\1\151\1\uffff\1\145\1\157\1\60\1\uffff\1\60\1\145\1\141\1\157\1\uffff\1\157\1\60\4\uffff\1\60\1\uffff\1\141\1\60\1\145\2\60\1\uffff\1\60\1\uffff\1\116\1\144\1\164\1\156\2\uffff\1\60\1\142\2\156\2\uffff\1\164\1\uffff\1\60\3\uffff\1\141\3\60\1\uffff\1\154\2\60\1\151\1\uffff\1\164\3\uffff\1\145\2\uffff\1\157\1\165\1\60\1\156\1\162\1\uffff\1\60\1\141\1\uffff\1\154\1\60\1\uffff";
     static final String DFA11_maxS =
-        "\1\uffff\1\uffff\1\157\1\170\1\156\1\151\1\141\1\165\1\145\1\162\1\163\1\166\1\76\1\165\1\uffff\1\52\2\75\1\76\1\uffff\1\164\1\165\1\157\2\56\1\141\1\165\1\157\1\156\1\145\1\164\1\156\1\162\1\157\1\77\1\uffff\1\75\1\157\2\uffff\1\157\1\162\2\uffff\1\164\1\145\1\157\1\uffff\1\141\2\uffff\1\46\1\uffff\1\44\2\uffff\1\47\5\uffff\1\145\1\154\1\141\1\155\1\uffff\1\165\1\164\1\163\1\160\3\172\2\164\1\160\1\145\1\163\1\165\1\162\1\145\1\163\4\uffff\1\145\1\uffff\1\156\5\uffff\1\164\1\167\1\154\16\uffff\2\144\1\160\1\164\1\163\1\172\1\163\1\164\1\145\1\162\5\uffff\2\160\1\157\1\147\1\164\1\141\1\162\1\164\2\154\1\144\1\154\7\uffff\1\162\1\154\2\uffff\1\162\1\154\1\143\1\157\2\uffff\1\164\1\141\1\162\1\164\1\144\1\uffff\1\155\12\uffff\1\143\1\154\1\163\1\160\1\157\1\155\1\151\2\145\1\157\1\164\1\141\1\151\1\145\3\uffff\1\162\1\145\2\172\1\162\1\154\1\151\1\157\1\156\1\145\1\157\1\156\1\163\1\161\1\145\2\163\2\172\1\154\2\172\1\145\1\162\1\164\1\145\1\uffff\1\145\1\172\1\162\2\172\2\154\1\172\1\145\1\154\1\151\1\172\1\165\1\151\1\126\1\145\1\154\1\172\1\141\1\172\1\163\1\153\1\160\1\172\1\155\1\172\1\146\1\151\1\164\2\151\1\141\1\171\1\142\1\153\1\172\1\163\1\157\1\162\1\172\1\146\1\156\1\172\1\162\2\151\1\154\1\156\1\162\1\141\1\162\2\uffff\1\171\1\151\1\157\1\156\1\154\1\163\1\172\1\167\2\172\1\165\1\164\4\uffff\1\146\2\uffff\1\172\2\uffff\1\156\1\151\3\162\1\uffff\1\141\2\uffff\2\145\1\uffff\1\147\1\172\1\156\1\uffff\1\145\1\155\2\156\1\157\1\162\1\145\1\uffff\1\164\1\uffff\1\145\1\141\1\145\1\uffff\1\151\1\uffff\1\172\1\141\1\151\1\166\1\156\1\164\1\172\1\144\1\172\1\uffff\1\172\1\163\1\143\1\uffff\1\172\1\144\1\146\1\uffff\1\164\1\145\1\141\2\151\1\146\1\162\1\141\2\172\1\156\1\145\1\166\1\151\1\uffff\1\163\2\uffff\1\145\1\164\1\171\1\uffff\1\144\1\142\1\141\1\145\1\166\1\164\1\172\1\141\1\145\1\uffff\1\147\1\156\1\151\1\171\1\166\1\151\1\145\1\143\1\151\1\172\1\147\1\162\1\164\1\uffff\1\154\1\143\1\145\1\151\1\171\1\uffff\1\141\2\uffff\2\145\1\uffff\1\163\2\172\1\163\1\154\1\144\1\164\1\141\1\171\1\154\1\uffff\1\145\1\154\1\163\1\145\1\157\1\145\2\172\1\141\2\172\1\165\1\143\1\144\1\145\1\151\1\uffff\1\156\1\162\1\172\1\143\1\164\1\172\1\141\2\144\1\164\1\154\1\uffff\1\145\1\164\2\151\1\172\1\164\1\144\1\164\1\160\1\172\1\163\2\172\1\uffff\1\172\1\uffff\3\172\1\145\1\143\3\172\1\171\2\172\1\162\1\156\2\uffff\1\142\2\uffff\2\164\2\172\1\157\2\172\1\uffff\2\145\1\uffff\1\154\1\172\1\123\1\151\1\145\1\172\1\171\1\166\1\172\1\uffff\1\151\1\172\1\151\1\145\1\uffff\1\172\6\uffff\1\172\1\145\3\uffff\1\172\2\uffff\1\155\1\164\1\154\1\145\1\172\2\uffff\1\156\2\uffff\1\172\1\144\1\151\1\uffff\1\145\1\157\1\172\1\uffff\1\172\1\145\1\141\1\157\1\uffff\1\157\1\172\2\uffff\1\172\1\uffff\1\141\1\172\1\145\1\172\1\uffff\1\172\1\uffff\1\116\1\144\1\164\1\156\2\uffff\1\172\1\142\2\156\2\uffff\1\164\1\uffff\1\172\2\uffff\1\141\3\172\1\uffff\1\154\2\172\1\151\1\uffff\1\164\3\uffff\1\145\2\uffff\1\157\1\165\1\172\1\156\1\162\1\uffff\1\172\1\141\1\uffff\1\154\1\172\1\uffff";
+        "\1\uffff\1\157\1\uffff\1\170\1\164\1\151\1\141\1\165\1\145\1\162\1\163\1\166\1\76\1\165\1\uffff\1\52\2\75\1\76\1\uffff\1\164\1\162\1\157\2\56\1\141\1\165\1\157\1\156\1\145\1\164\1\156\1\162\1\157\1\77\1\uffff\1\75\1\165\1\157\1\165\2\uffff\1\157\1\162\2\uffff\1\164\1\145\1\uffff\1\141\2\uffff\1\46\1\uffff\1\44\2\uffff\1\47\4\uffff\1\154\1\145\1\156\1\141\2\uffff\1\165\1\164\1\163\1\160\1\145\3\172\2\164\1\160\1\145\1\163\1\165\1\162\1\145\1\163\4\uffff\1\145\1\uffff\1\156\5\uffff\1\164\1\167\1\154\16\uffff\2\144\1\160\1\164\1\163\1\172\1\163\1\145\1\162\5\uffff\2\160\1\157\1\147\1\164\1\141\1\162\1\164\2\154\1\144\1\154\7\uffff\1\146\1\144\1\162\1\154\1\141\2\uffff\1\162\1\154\1\143\1\157\2\uffff\1\164\1\141\1\162\1\164\1\uffff\1\155\12\uffff\1\154\1\143\1\163\1\160\1\163\1\157\1\155\1\151\2\145\1\157\1\162\1\164\1\157\1\151\1\164\1\145\3\uffff\1\162\1\145\2\172\1\162\1\154\1\151\1\157\1\156\1\145\1\157\1\156\1\163\1\161\1\145\2\163\2\172\1\154\2\172\1\145\1\162\1\164\1\145\1\uffff\1\145\1\162\2\172\2\154\1\172\1\145\1\154\1\151\1\172\1\165\1\151\1\126\1\145\1\154\1\146\1\171\1\172\1\141\1\162\1\172\1\163\1\153\1\160\1\172\1\155\1\172\1\146\1\151\1\164\2\151\1\141\1\142\1\172\1\153\1\165\1\157\1\163\1\162\1\172\1\146\1\156\1\172\1\162\1\151\1\141\1\151\1\154\1\153\1\156\1\141\1\162\1\141\1\162\2\uffff\1\171\1\151\1\157\1\156\1\154\1\163\1\172\1\167\2\172\1\165\1\164\4\uffff\1\146\2\uffff\1\172\2\uffff\1\156\1\151\3\162\1\141\2\uffff\2\145\1\uffff\1\147\1\172\1\156\1\uffff\1\145\1\155\2\156\1\157\1\162\2\145\1\172\1\uffff\1\164\1\144\1\uffff\1\145\1\141\1\145\1\uffff\1\151\1\uffff\1\172\1\141\1\151\1\166\1\156\1\164\1\144\1\uffff\1\172\1\155\1\163\1\172\1\143\1\uffff\1\172\1\144\1\146\1\uffff\1\164\1\145\1\164\1\141\1\151\1\145\1\151\1\154\1\146\1\162\1\141\2\172\1\156\1\145\1\166\1\151\1\uffff\1\163\2\uffff\1\145\1\164\1\171\1\uffff\1\144\1\142\1\141\1\145\1\166\1\164\1\172\1\141\1\145\1\uffff\1\147\1\156\1\151\1\171\1\166\1\151\1\145\1\143\1\162\1\uffff\1\151\2\172\1\147\1\162\1\164\1\uffff\1\154\1\143\1\145\1\151\1\171\1\141\1\uffff\2\145\1\uffff\1\145\1\uffff\1\163\2\172\1\163\1\145\1\154\1\144\1\172\1\164\1\154\1\141\1\171\1\154\1\uffff\1\145\1\154\1\163\1\145\1\157\1\145\2\172\1\141\2\172\1\165\1\143\1\144\1\145\1\151\1\uffff\1\156\1\162\1\172\1\143\1\164\1\172\1\141\2\144\1\164\1\172\1\154\2\uffff\1\145\1\164\2\151\1\172\1\164\1\144\1\164\1\160\1\172\2\163\2\172\1\uffff\1\172\1\uffff\1\172\1\163\2\172\1\uffff\1\145\1\172\1\143\3\172\1\171\2\172\1\162\1\156\2\uffff\1\142\1\uffff\1\124\1\uffff\2\164\2\172\1\157\2\172\1\uffff\2\145\1\uffff\1\154\1\172\1\123\1\151\1\uffff\1\145\1\172\1\171\1\166\1\172\1\uffff\1\151\1\172\1\151\1\145\1\uffff\2\172\4\uffff\1\172\2\uffff\1\172\1\uffff\1\145\3\uffff\1\172\2\uffff\1\155\1\164\1\154\1\157\1\145\1\172\2\uffff\1\156\2\uffff\1\172\1\144\1\151\1\uffff\1\145\1\157\1\172\1\uffff\1\172\1\145\1\141\1\157\1\uffff\1\157\1\172\4\uffff\1\172\1\uffff\1\141\1\172\1\145\2\172\1\uffff\1\172\1\uffff\1\116\1\144\1\164\1\156\2\uffff\1\172\1\142\2\156\2\uffff\1\164\1\uffff\1\172\3\uffff\1\141\3\172\1\uffff\1\154\2\172\1\151\1\uffff\1\164\3\uffff\1\145\2\uffff\1\157\1\165\1\172\1\156\1\162\1\uffff\1\172\1\141\1\uffff\1\154\1\172\1\uffff";
     static final String DFA11_acceptS =
-        "\1\uffff\1\1\14\uffff\1\20\4\uffff\1\27\17\uffff\1\65\2\uffff\1\73\1\74\2\uffff\1\102\1\103\3\uffff\1\120\1\uffff\1\132\1\133\1\uffff\1\u0082\4\uffff\1\u0089\1\u008b\1\u008e\1\u008f\1\1\4\uffff\1\u0089\20\uffff\1\15\1\152\1\154\1\156\1\uffff\1\161\1\uffff\1\167\1\173\1\36\1\u008d\1\16\3\uffff\1\20\1\u0088\1\u008c\1\21\1\63\1\124\1\22\1\25\1\23\1\26\1\30\1\126\1\24\1\27\12\uffff\1\123\1\35\1\37\1\40\1\61\14\uffff\1\60\1\u0084\1\u0083\1\65\1\71\1\104\1\67\2\uffff\1\73\1\74\4\uffff\1\102\1\103\5\uffff\1\120\1\uffff\1\132\1\133\1\143\1\u0082\1\u0085\1\u0086\1\u0087\1\u008a\1\u008b\1\u008e\16\uffff\1\72\1\134\1\153\32\uffff\1\32\63\uffff\1\141\1\7\14\uffff\1\160\1\175\1\163\1\165\1\uffff\1\17\1\77\1\uffff\1\31\1\62\5\uffff\1\100\1\uffff\1\33\1\41\2\uffff\1\54\3\uffff\1\53\7\uffff\1\70\1\uffff\1\76\3\uffff\1\131\1\uffff\1\105\11\uffff\1\75\3\uffff\1\112\3\uffff\1\136\16\uffff\1\u0080\1\uffff\1\135\1\14\3\uffff\1\130\11\uffff\1\45\15\uffff\1\142\5\uffff\1\116\1\uffff\1\2\1\121\2\uffff\1\137\12\uffff\1\10\20\uffff\1\42\13\uffff\1\u0081\15\uffff\1\140\1\uffff\1\4\15\uffff\1\115\1\162\1\uffff\1\146\1\66\7\uffff\1\46\2\uffff\1\50\11\uffff\1\147\4\uffff\1\125\1\uffff\1\3\1\122\1\5\1\34\1\107\1\127\2\uffff\1\6\1\113\1\11\1\uffff\1\12\1\174\5\uffff\1\155\1\64\1\uffff\1\43\1\44\3\uffff\1\52\3\uffff\1\101\4\uffff\1\151\2\uffff\1\172\1\144\1\uffff\1\157\4\uffff\1\176\1\uffff\1\55\4\uffff\1\166\1\117\4\uffff\1\111\1\177\1\uffff\1\145\1\uffff\1\106\1\114\4\uffff\1\170\4\uffff\1\164\1\uffff\1\51\1\57\1\56\1\uffff\1\110\1\150\5\uffff\1\171\2\uffff\1\13\2\uffff\1\47";
+        "\2\uffff\1\2\13\uffff\1\21\4\uffff\1\30\17\uffff\1\66\4\uffff\1\100\1\101\2\uffff\1\106\1\107\2\uffff\1\124\1\uffff\1\136\1\137\1\uffff\1\u0088\4\uffff\1\u008f\1\u0091\1\u0094\1\u0095\4\uffff\1\u008f\1\2\21\uffff\1\16\1\160\1\162\1\164\1\uffff\1\167\1\uffff\1\175\1\u0081\1\37\1\u0093\1\17\3\uffff\1\21\1\u008e\1\u0092\1\22\1\64\1\130\1\23\1\26\1\24\1\27\1\31\1\132\1\25\1\30\11\uffff\1\127\1\36\1\40\1\41\1\62\14\uffff\1\61\1\u008a\1\u0089\1\66\1\73\1\110\1\71\5\uffff\1\100\1\101\4\uffff\1\106\1\107\4\uffff\1\124\1\uffff\1\136\1\137\1\147\1\u0088\1\u008b\1\u008c\1\u008d\1\u0090\1\u0091\1\u0094\21\uffff\1\102\1\140\1\161\32\uffff\1\33\70\uffff\1\145\1\10\14\uffff\1\166\1\u0083\1\171\1\173\1\uffff\1\20\1\104\1\uffff\1\32\1\63\6\uffff\1\34\1\42\2\uffff\1\55\3\uffff\1\54\11\uffff\1\74\2\uffff\1\103\3\uffff\1\135\1\uffff\1\111\7\uffff\1\1\5\uffff\1\116\3\uffff\1\142\21\uffff\1\u0086\1\uffff\1\141\1\15\3\uffff\1\134\11\uffff\1\46\11\uffff\1\122\6\uffff\1\146\6\uffff\1\3\2\uffff\1\125\1\uffff\1\143\15\uffff\1\11\20\uffff\1\43\14\uffff\1\76\1\u0087\16\uffff\1\144\1\uffff\1\5\4\uffff\1\152\13\uffff\1\121\1\170\1\uffff\1\154\1\uffff\1\70\7\uffff\1\47\2\uffff\1\51\4\uffff\1\72\5\uffff\1\155\4\uffff\1\131\2\uffff\1\4\1\126\1\6\1\35\1\uffff\1\113\1\133\1\uffff\1\151\1\uffff\1\7\1\117\1\12\1\uffff\1\13\1\u0082\6\uffff\1\163\1\65\1\uffff\1\44\1\45\3\uffff\1\53\3\uffff\1\105\4\uffff\1\157\2\uffff\1\75\1\u0080\1\77\1\150\1\uffff\1\165\5\uffff\1\u0084\1\uffff\1\56\4\uffff\1\174\1\123\4\uffff\1\115\1\u0085\1\uffff\1\153\1\uffff\1\67\1\112\1\120\4\uffff\1\176\4\uffff\1\172\1\uffff\1\52\1\60\1\57\1\uffff\1\114\1\156\5\uffff\1\177\2\uffff\1\14\2\uffff\1\50";
     static final String DFA11_specialS =
-        "\1\0\65\uffff\1\1\1\2\u021d\uffff}>";
+        "\1\2\66\uffff\1\0\1\1\u0242\uffff}>";
     static final String[] DFA11_transitionS = {
-            "\11\74\2\73\2\74\1\73\22\74\1\73\1\13\1\66\1\57\2\74\1\63\1\67\1\52\1\53\1\16\1\20\1\43\1\14\1\27\1\17\12\72\1\44\1\1\1\22\1\23\1\21\1\30\1\64\1\71\1\33\1\41\5\71\1\34\2\71\1\60\1\31\1\71\1\40\2\71\1\35\1\36\1\32\1\37\5\71\1\61\1\74\1\62\1\74\1\70\1\74\1\24\1\56\1\2\1\55\1\3\1\50\2\71\1\4\2\71\1\5\1\6\1\15\1\25\1\51\1\7\1\10\1\54\1\11\1\12\1\45\1\71\1\26\2\71\1\46\1\42\1\47\45\74\1\65\uff5c\74",
-            "",
-            "\1\77\6\uffff\1\76\3\uffff\1\100\2\uffff\1\101",
-            "\1\105\1\uffff\1\103\11\uffff\1\104",
-            "\1\111\1\uffff\1\110\6\uffff\1\106\1\107",
-            "\1\113\3\uffff\1\112",
-            "\1\114",
-            "\1\115",
+            "\11\75\2\74\2\75\1\74\22\75\1\74\1\13\1\67\1\60\2\75\1\64\1\70\1\54\1\55\1\16\1\20\1\43\1\14\1\27\1\17\12\73\1\44\1\2\1\22\1\23\1\21\1\30\1\65\1\72\1\33\1\41\5\72\1\34\2\72\1\61\1\31\1\72\1\40\2\72\1\35\1\36\1\32\1\37\5\72\1\62\1\75\1\63\1\75\1\71\1\75\1\24\1\45\1\1\1\57\1\3\1\52\1\47\1\72\1\4\2\72\1\5\1\6\1\15\1\25\1\53\1\7\1\10\1\56\1\11\1\12\1\46\1\72\1\26\2\72\1\50\1\42\1\51\45\75\1\66\uff5c\75",
+            "\1\76\6\uffff\1\77\3\uffff\1\101\2\uffff\1\100",
+            "",
+            "\1\106\1\uffff\1\104\11\uffff\1\105",
+            "\1\113\1\uffff\1\112\6\uffff\1\107\1\111\5\uffff\1\110",
+            "\1\115\3\uffff\1\114",
             "\1\116",
-            "\1\120\11\uffff\1\117",
-            "\1\122\4\uffff\1\121",
-            "\1\133\1\124\4\uffff\1\125\5\uffff\1\126\2\uffff\1\127\1\123\1\130\1\131\1\132",
-            "\1\135\20\uffff\1\134",
-            "\1\140\11\uffff\1\137\5\uffff\1\141",
-            "",
-            "\1\143\2\uffff\1\144",
-            "\1\147\21\uffff\1\146",
-            "\1\151",
-            "\1\155\17\uffff\1\153\1\154",
-            "",
-            "\1\164\1\uffff\1\161\11\uffff\1\160\1\uffff\1\162\3\uffff\1\163",
-            "\1\166\15\uffff\1\170\1\uffff\1\165\2\uffff\1\167",
-            "\1\171",
+            "\1\117",
+            "\1\120",
+            "\1\122\11\uffff\1\121",
+            "\1\124\4\uffff\1\123",
+            "\1\135\1\126\4\uffff\1\127\5\uffff\1\130\2\uffff\1\131\1\125\1\132\1\133\1\134",
+            "\1\137\20\uffff\1\136",
+            "\1\142\11\uffff\1\141\5\uffff\1\143",
+            "",
+            "\1\145\2\uffff\1\146",
+            "\1\151\21\uffff\1\150",
+            "\1\153",
+            "\1\157\17\uffff\1\155\1\156",
+            "",
+            "\1\166\1\uffff\1\163\11\uffff\1\162\1\uffff\1\164\3\uffff\1\165",
+            "\1\170\15\uffff\1\171\1\uffff\1\167",
             "\1\172",
-            "\1\175\1\174",
-            "\1\177",
+            "\1\173",
+            "\1\176\1\175",
             "\1\u0080",
-            "\1\u0082\15\uffff\1\u0081",
-            "\1\u0083",
+            "\1\u0081",
+            "\1\u0083\15\uffff\1\u0082",
             "\1\u0084",
-            "\1\u0086\16\uffff\1\u0085",
-            "\1\u0087",
-            "\1\u0088\16\uffff\1\u0089",
-            "\1\u008a",
-            "\1\u008c\15\uffff\1\u008b",
+            "\1\u0085",
+            "\1\u0087\16\uffff\1\u0086",
+            "\1\u0088",
+            "\1\u0089\16\uffff\1\u008a",
+            "\1\u008b",
+            "\1\u008d\15\uffff\1\u008c",
             "",
-            "\1\u0090\2\uffff\1\u008f",
-            "\1\u0092\15\uffff\1\u0093",
+            "\1\u0091\2\uffff\1\u0090",
+            "\1\u0094\5\uffff\1\u0093",
+            "\1\u0095\15\uffff\1\u0096",
+            "\1\u0097",
             "",
             "",
-            "\1\u0097\15\uffff\1\u0096",
-            "\1\u0098\20\uffff\1\u0099",
+            "\1\u009b\15\uffff\1\u009a",
+            "\1\u009c\20\uffff\1\u009d",
             "",
             "",
-            "\1\u009c\16\uffff\1\u009d",
-            "\1\u009f\3\uffff\1\u009e",
-            "\1\u00a0",
+            "\1\u00a0\16\uffff\1\u00a1",
+            "\1\u00a3\3\uffff\1\u00a2",
             "",
-            "\1\u00a2",
+            "\1\u00a5",
             "",
             "",
-            "\1\u00a5",
+            "\1\u00a8",
             "",
-            "\1\u00a7",
-            "\0\u00a8",
-            "\0\u00a9",
             "\1\u00aa",
+            "\0\u00ab",
+            "\0\u00ac",
+            "\1\u00ad",
             "",
             "",
             "",
             "",
-            "",
-            "\1\u00ad",
-            "\1\u00ae",
-            "\1\u00af",
             "\1\u00b0",
-            "",
-            "\1\u00b3\1\uffff\1\u00b1\16\uffff\1\u00b2",
+            "\1\u00b1",
+            "\1\u00b3\1\u00b2",
             "\1\u00b4",
-            "\1\u00b5",
-            "\1\u00b6",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\5\102\1\u00b9\2\102\1\u00b7\12\102\1\u00ba\1\102\1\u00b8\4\102",
+            "",
+            "",
+            "\1\u00b7\1\uffff\1\u00b5\16\uffff\1\u00b6",
+            "\1\u00b8",
+            "\1\u00b9",
+            "\1\u00ba",
+            "\1\u00bb",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\5\102\1\u00be\2\102\1\u00bc\11\102\1\u00bf\1\u00c0\1\102\1\u00bd\4\102",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u00be\21\uffff\1\u00bf",
-            "\1\u00c0",
-            "\1\u00c1",
-            "\1\u00c2",
-            "\1\u00c3\4\uffff\1\u00c4\14\uffff\1\u00c5",
-            "\1\u00c6\23\uffff\1\u00c7",
-            "\1\u00c9\14\uffff\1\u00c8",
-            "\1\u00ca",
-            "\1\u00cb\11\uffff\1\u00cc",
+            "\1\u00c4\21\uffff\1\u00c5",
+            "\1\u00c6",
+            "\1\u00c7",
+            "\1\u00c8",
+            "\1\u00c9\4\uffff\1\u00ca\14\uffff\1\u00cb",
+            "\1\u00cc\23\uffff\1\u00cd",
+            "\1\u00cf\14\uffff\1\u00ce",
+            "\1\u00d0",
+            "\1\u00d1\11\uffff\1\u00d2",
             "",
             "",
             "",
             "",
-            "\1\u00cd",
+            "\1\u00d3",
             "",
-            "\1\u00ce",
+            "\1\u00d4",
             "",
             "",
             "",
             "",
             "",
-            "\1\u00cf",
-            "\1\u00d0",
-            "\1\u00d1",
+            "\1\u00d5",
+            "\1\u00d6",
+            "\1\u00d7",
             "",
             "",
             "",
@@ -4669,33 +4845,32 @@ public class InternalQVTimperativeLexer extends Lexer {
             "",
             "",
             "",
-            "\1\u00d2",
-            "\1\u00d3",
-            "\1\u00d4",
-            "\1\u00d5",
-            "\1\u00d6",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\3\102\1\u00d7\26\102",
+            "\1\u00d8",
             "\1\u00d9",
             "\1\u00da",
             "\1\u00db",
             "\1\u00dc",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\3\102\1\u00dd\26\102",
+            "\1\u00df",
+            "\1\u00e0",
+            "\1\u00e1",
             "",
             "",
             "",
             "",
             "",
-            "\1\u00dd",
-            "\1\u00de",
-            "\1\u00df",
-            "\1\u00e0",
-            "\1\u00e1",
             "\1\u00e2",
             "\1\u00e3",
-            "\1\u00e5\2\uffff\1\u00e4",
+            "\1\u00e4",
+            "\1\u00e5",
             "\1\u00e6",
             "\1\u00e7",
             "\1\u00e8",
-            "\1\u00e9",
+            "\1\u00ea\2\uffff\1\u00e9",
+            "\1\u00eb",
+            "\1\u00ec",
+            "\1\u00ed",
+            "\1\u00ee",
             "",
             "",
             "",
@@ -4703,23 +4878,25 @@ public class InternalQVTimperativeLexer extends Lexer {
             "",
             "",
             "",
-            "\1\u00ea",
-            "\1\u00eb",
+            "\1\u00ef",
+            "\1\u00f0",
+            "\1\u00f1",
+            "\1\u00f2",
+            "\1\u00f3",
             "",
             "",
-            "\1\u00ec",
-            "\1\u00ed",
-            "\1\u00ee",
-            "\1\u00f0\3\uffff\1\u00f1\5\uffff\1\u00ef",
+            "\1\u00f4",
+            "\1\u00f5",
+            "\1\u00f6",
+            "\1\u00f8\3\uffff\1\u00f9\5\uffff\1\u00f7",
             "",
             "",
-            "\1\u00f3\5\uffff\1\u00f4\1\uffff\1\u00f2",
-            "\1\u00f5",
-            "\1\u00f7\13\uffff\1\u00f6",
-            "\1\u00f8",
-            "\1\u00f9",
+            "\1\u00fb\5\uffff\1\u00fc\1\uffff\1\u00fa",
+            "\1\u00fd",
+            "\1\u00ff\13\uffff\1\u00fe",
+            "\1\u0100",
             "",
-            "\1\u00fa",
+            "\1\u0101",
             "",
             "",
             "",
@@ -4730,194 +4907,182 @@ public class InternalQVTimperativeLexer extends Lexer {
             "",
             "",
             "",
-            "\1\u00fb",
-            "\1\u00fc",
-            "\1\u00fd",
-            "\1\u00fe",
-            "\1\u00ff",
-            "\1\u0100",
-            "\1\u0101",
             "\1\u0102",
             "\1\u0103",
-            "\1\u0105\2\uffff\1\u0104",
+            "\1\u0104",
+            "\1\u0105",
             "\1\u0106",
             "\1\u0107",
             "\1\u0108",
             "\1\u0109",
-            "",
-            "",
-            "",
             "\1\u010a",
             "\1\u010b",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u010d\2\uffff\1\u010c",
             "\1\u010e",
-            "\1\u0110\7\uffff\1\u010f",
-            "\1\u0111",
+            "\1\u010f",
+            "\1\u0110\15\uffff\1\u0111",
             "\1\u0112",
             "\1\u0113",
             "\1\u0114",
+            "",
+            "",
+            "",
             "\1\u0115",
             "\1\u0116",
-            "\1\u0117",
-            "\1\u0118",
-            "\1\u0119",
-            "\1\u011a\21\uffff\1\u011b",
-            "\1\u011c\11\uffff\1\u011d",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\10\102\1\u011e\21\102",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u0121",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u0119",
+            "\1\u011b\7\uffff\1\u011a",
+            "\1\u011c",
+            "\1\u011d",
+            "\1\u011e",
+            "\1\u011f",
+            "\1\u0120",
+            "\1\u0121",
+            "\1\u0122",
+            "\1\u0123",
             "\1\u0124",
-            "\1\u0125",
-            "\1\u0126",
-            "\1\u0127",
-            "",
-            "\1\u0128",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u012a",
+            "\1\u0125\21\uffff\1\u0126",
+            "\1\u0127\11\uffff\1\u0128",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\10\102\1\u0129\21\102",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u012c",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u012d",
-            "\1\u012e",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u012f",
             "\1\u0130",
             "\1\u0131",
             "\1\u0132",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "",
+            "\1\u0133",
             "\1\u0134",
-            "\1\u0135",
-            "\1\u0136\7\uffff\1\u0137\14\uffff\1\u0138",
-            "\1\u0139",
-            "\1\u013a",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u0137",
+            "\1\u0138",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u013a",
+            "\1\u013b",
             "\1\u013c",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u013e",
             "\1\u013f",
-            "\1\u0140",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u0142",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u0140\7\uffff\1\u0141\14\uffff\1\u0142",
+            "\1\u0143",
             "\1\u0144",
             "\1\u0145",
             "\1\u0146",
-            "\1\u0147",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u0148",
             "\1\u0149",
-            "\1\u014a",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u014b",
             "\1\u014c",
+            "\1\u014d",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u014e",
             "\1\u014f",
-            "\1\u0150",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u0151",
             "\1\u0152",
             "\1\u0153",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\10\102\1\u0154\21\102",
+            "\1\u0154",
+            "\1\u0155",
             "\1\u0156",
             "\1\u0157",
-            "\1\u0158",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u0159",
             "\1\u015a",
             "\1\u015b",
             "\1\u015c",
             "\1\u015d",
-            "",
-            "",
-            "\1\u015e",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u015f",
             "\1\u0160",
-            "\1\u0161",
-            "\1\u0162",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\10\102\1\u0161\21\102",
             "\1\u0163",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u0164",
             "\1\u0165",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u0166",
+            "\1\u0167",
             "\1\u0168",
             "\1\u0169",
-            "",
-            "",
-            "",
-            "",
             "\1\u016a",
-            "",
-            "",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "",
-            "",
+            "\1\u016b",
             "\1\u016c",
             "\1\u016d",
+            "",
+            "",
             "\1\u016e",
             "\1\u016f",
             "\1\u0170",
-            "",
             "\1\u0171",
-            "",
-            "",
             "\1\u0172",
             "\1\u0173",
-            "",
-            "\1\u0174",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u0176",
-            "",
-            "\1\u0177",
+            "\1\u0175",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u0178",
             "\1\u0179",
+            "",
+            "",
+            "",
+            "",
             "\1\u017a",
-            "\1\u017b",
+            "",
+            "",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "",
+            "",
             "\1\u017c",
             "\1\u017d",
-            "",
             "\1\u017e",
-            "",
             "\1\u017f",
             "\1\u0180",
             "\1\u0181",
             "",
+            "",
             "\1\u0182",
+            "\1\u0183",
             "",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u0184",
-            "\1\u0185",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u0186",
+            "",
             "\1\u0187",
             "\1\u0188",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u0189",
             "\1\u018a",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u018b",
+            "\1\u018c",
             "\1\u018d",
             "\1\u018e",
-            "",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "",
             "\1\u0190",
             "\1\u0191",
             "",
             "\1\u0192",
             "\1\u0193",
             "\1\u0194",
+            "",
             "\1\u0195",
-            "\1\u0196",
+            "",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u0197",
             "\1\u0198",
             "\1\u0199",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u019a",
             "\1\u019b",
             "\1\u019c",
-            "\1\u019d",
-            "\1\u019e",
-            "\1\u019f\2\uffff\1\u01a0",
             "",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u019e",
+            "\1\u019f",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u01a1",
             "",
-            "",
-            "\1\u01a2",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u01a3",
             "\1\u01a4",
             "",
@@ -4927,231 +5092,278 @@ public class InternalQVTimperativeLexer extends Lexer {
             "\1\u01a8",
             "\1\u01a9",
             "\1\u01aa",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u01ab",
             "\1\u01ac",
             "\1\u01ad",
-            "",
             "\1\u01ae",
             "\1\u01af",
-            "\1\u01b0",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u01b1",
             "\1\u01b2",
             "\1\u01b3",
             "\1\u01b4",
-            "\1\u01b5",
-            "\1\u01b6",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u01b5\2\uffff\1\u01b6",
+            "",
+            "\1\u01b7",
+            "",
+            "",
             "\1\u01b8",
             "\1\u01b9",
             "\1\u01ba",
             "",
             "\1\u01bb",
             "\1\u01bc",
-            "\1\u01bd\3\uffff\1\u01be",
+            "\1\u01bd",
+            "\1\u01be",
             "\1\u01bf",
             "\1\u01c0",
-            "",
-            "\1\u01c1",
-            "",
-            "",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u01c2",
             "\1\u01c3",
             "",
             "\1\u01c4",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\22\102\1\u01c6\7\102",
+            "\1\u01c5",
+            "\1\u01c6",
+            "\1\u01c7",
             "\1\u01c8",
             "\1\u01c9",
             "\1\u01ca",
             "\1\u01cb",
             "\1\u01cc",
-            "\1\u01cd",
-            "\1\u01ce",
             "",
-            "\1\u01cf",
+            "\1\u01cd",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\1\u01d0",
             "\1\u01d1",
             "\1\u01d2",
+            "",
             "\1\u01d3",
             "\1\u01d4",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u01d5\3\uffff\1\u01d6",
             "\1\u01d7",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u01d8",
+            "\1\u01d9",
+            "",
             "\1\u01da",
             "\1\u01db",
+            "",
             "\1\u01dc",
-            "\1\u01dd",
-            "\1\u01de",
             "",
-            "\1\u01df",
-            "\1\u01e0",
+            "\1\u01dd",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\22\102\1\u01df\7\102",
+            "\1\u01e1",
             "\1\u01e2",
             "\1\u01e3",
+            "\1\u01e4",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u01e5",
             "\1\u01e6",
             "\1\u01e7",
             "\1\u01e8",
             "\1\u01e9",
-            "",
             "\1\u01ea",
+            "",
             "\1\u01eb",
             "\1\u01ec",
             "\1\u01ed",
-            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u01ee",
             "\1\u01ef",
             "\1\u01f0",
-            "\1\u01f1",
-            "\1\u01f2",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u01f4",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u01f3",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\22\102\1\u01f5\7\102",
+            "\1\u01f7",
+            "\1\u01f8",
+            "\1\u01f9",
+            "\1\u01fa",
+            "\1\u01fb",
             "",
+            "\1\u01fc",
+            "\1\u01fd",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u01ff",
+            "\1\u0200",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u0202",
+            "\1\u0203",
+            "\1\u0204",
+            "\1\u0205",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u0207",
             "",
+            "",
+            "\1\u0208",
+            "\1\u0209",
+            "\1\u020a",
+            "\1\u020b",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u020d",
+            "\1\u020e",
+            "\1\u020f",
+            "\1\u0210",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u0212",
+            "\1\u0213",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u01fb",
-            "\1\u01fc",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u0200",
+            "\1\u0218",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u0203",
-            "\1\u0204",
             "",
+            "\1\u021b",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u021d",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u0221",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u0224",
+            "\1\u0225",
             "",
-            "\1\u0205",
             "",
+            "\1\u0226",
             "",
-            "\1\u0206",
-            "\1\u0207",
+            "\1\u0227",
+            "",
+            "\1\u0228",
+            "\1\u0229",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u020a",
+            "\1\u022c",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "",
-            "\1\u020d",
-            "\1\u020e",
+            "\1\u022f",
+            "\1\u0230",
             "",
-            "\1\u020f",
+            "\1\u0231",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u0211",
-            "\1\u0212",
-            "\1\u0213",
+            "\1\u0233",
+            "\1\u0234",
+            "",
+            "\1\u0235",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u0215",
-            "\1\u0216",
-            "\1\u0217",
+            "\1\u0237",
+            "\1\u0238",
+            "\1\u0239",
             "",
-            "\1\u0218",
+            "\1\u023a",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u021a",
-            "\1\u021b",
+            "\1\u023c",
+            "\1\u023d",
             "",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "",
             "",
             "",
             "",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "",
             "",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u021e",
+            "",
+            "\1\u0242",
             "",
             "",
             "",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "",
             "",
-            "\1\u0220",
-            "\1\u0221",
-            "\1\u0222",
-            "\1\u0223",
+            "\1\u0244",
+            "\1\u0245",
+            "\1\u0246",
+            "\1\u0247",
+            "\1\u0248",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "",
             "",
-            "\1\u0225",
+            "\1\u024a",
             "",
             "",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u0227",
-            "\1\u0228",
+            "\1\u024c",
+            "\1\u024d",
             "",
-            "\1\u0229",
-            "\1\u022a",
+            "\1\u024e",
+            "\1\u024f",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u022d",
-            "\1\u022e",
-            "\1\u022f",
+            "\1\u0252",
+            "\1\u0253",
+            "\1\u0254",
             "",
-            "\1\u0230",
+            "\1\u0255",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "",
             "",
+            "",
+            "",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "",
-            "\1\u0233",
+            "\1\u0258",
+            "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
+            "\1\u025a",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u0235",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "",
-            "\1\u0238",
-            "\1\u0239",
-            "\1\u023a",
-            "\1\u023b",
+            "\1\u025e",
+            "\1\u025f",
+            "\1\u0260",
+            "\1\u0261",
             "",
             "",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u023d",
-            "\1\u023e",
-            "\1\u023f",
+            "\1\u0263",
+            "\1\u0264",
+            "\1\u0265",
             "",
             "",
-            "\1\u0240",
+            "\1\u0266",
             "",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "",
             "",
-            "\1\u0242",
+            "",
+            "\1\u0268",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "",
-            "\1\u0246",
+            "\1\u026c",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u0249",
+            "\1\u026f",
             "",
-            "\1\u024a",
+            "\1\u0270",
             "",
             "",
             "",
-            "\1\u024b",
+            "\1\u0271",
             "",
             "",
-            "\1\u024c",
-            "\1\u024d",
+            "\1\u0272",
+            "\1\u0273",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u024f",
-            "\1\u0250",
+            "\1\u0275",
+            "\1\u0276",
             "",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
-            "\1\u0252",
+            "\1\u0278",
             "",
-            "\1\u0253",
+            "\1\u0279",
             "\12\102\7\uffff\32\102\4\uffff\1\102\1\uffff\32\102",
             ""
     };
@@ -5186,19 +5398,39 @@ public class InternalQVTimperativeLexer extends Lexer {
             this.transition = DFA11_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | T__135 | T__136 | T__137 | T__138 | T__139 | T__140 | T__141 | T__142 | T__143 | T__144 | T__145 | T__146 | T__147 | T__148 | RULE_UNQUOTED_STRING | RULE_DOUBLE_QUOTED_STRING | RULE_SINGLE_QUOTED_STRING | RULE_ML_SINGLE_QUOTED_STRING | RULE_SIMPLE_ID | RULE_ESCAPED_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | T__97 | T__98 | T__99 | T__100 | T__101 | T__102 | T__103 | T__104 | T__105 | T__106 | T__107 | T__108 | T__109 | T__110 | T__111 | T__112 | T__113 | T__114 | T__115 | T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T__122 | T__123 | T__124 | T__125 | T__126 | T__127 | T__128 | T__129 | T__130 | T__131 | T__132 | T__133 | T__134 | T__135 | T__136 | T__137 | T__138 | T__139 | T__140 | T__141 | T__142 | T__143 | T__144 | T__145 | T__146 | T__147 | T__148 | T__149 | T__150 | T__151 | T__152 | T__153 | T__154 | RULE_UNQUOTED_STRING | RULE_DOUBLE_QUOTED_STRING | RULE_SINGLE_QUOTED_STRING | RULE_ML_SINGLE_QUOTED_STRING | RULE_SIMPLE_ID | RULE_ESCAPED_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             IntStream input = _input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
+                        int LA11_55 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA11_55>='\u0000' && LA11_55<='\uFFFF')) ) {s = 171;}
+
+                        else s = 61;
+
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA11_56 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA11_56>='\u0000' && LA11_56<='\uFFFF')) ) {s = 172;}
+
+                        else s = 61;
+
+                        if ( s>=0 ) return s;
+                        break;
+                    case 2 : 
                         int LA11_0 = input.LA(1);
 
                         s = -1;
-                        if ( (LA11_0==';') ) {s = 1;}
+                        if ( (LA11_0=='c') ) {s = 1;}
 
-                        else if ( (LA11_0=='c') ) {s = 2;}
+                        else if ( (LA11_0==';') ) {s = 2;}
 
                         else if ( (LA11_0=='e') ) {s = 3;}
 
@@ -5268,73 +5500,55 @@ public class InternalQVTimperativeLexer extends Lexer {
 
                         else if ( (LA11_0==':') ) {s = 36;}
 
-                        else if ( (LA11_0=='v') ) {s = 37;}
-
-                        else if ( (LA11_0=='{') ) {s = 38;}
+                        else if ( (LA11_0=='b') ) {s = 37;}
 
-                        else if ( (LA11_0=='}') ) {s = 39;}
+                        else if ( (LA11_0=='v') ) {s = 38;}
 
-                        else if ( (LA11_0=='f') ) {s = 40;}
+                        else if ( (LA11_0=='g') ) {s = 39;}
 
-                        else if ( (LA11_0=='p') ) {s = 41;}
+                        else if ( (LA11_0=='{') ) {s = 40;}
 
-                        else if ( (LA11_0=='(') ) {s = 42;}
+                        else if ( (LA11_0=='}') ) {s = 41;}
 
-                        else if ( (LA11_0==')') ) {s = 43;}
+                        else if ( (LA11_0=='f') ) {s = 42;}
 
-                        else if ( (LA11_0=='s') ) {s = 44;}
+                        else if ( (LA11_0=='p') ) {s = 43;}
 
-                        else if ( (LA11_0=='d') ) {s = 45;}
+                        else if ( (LA11_0=='(') ) {s = 44;}
 
-                        else if ( (LA11_0=='b') ) {s = 46;}
+                        else if ( (LA11_0==')') ) {s = 45;}
 
-                        else if ( (LA11_0=='#') ) {s = 47;}
+                        else if ( (LA11_0=='s') ) {s = 46;}
 
-                        else if ( (LA11_0=='L') ) {s = 48;}
+                        else if ( (LA11_0=='d') ) {s = 47;}
 
-                        else if ( (LA11_0=='[') ) {s = 49;}
+                        else if ( (LA11_0=='#') ) {s = 48;}
 
-                        else if ( (LA11_0==']') ) {s = 50;}
+                        else if ( (LA11_0=='L') ) {s = 49;}
 
-                        else if ( (LA11_0=='&') ) {s = 51;}
+                        else if ( (LA11_0=='[') ) {s = 50;}
 
-                        else if ( (LA11_0=='@') ) {s = 52;}
+                        else if ( (LA11_0==']') ) {s = 51;}
 
-                        else if ( (LA11_0=='\u00A3') ) {s = 53;}
+                        else if ( (LA11_0=='&') ) {s = 52;}
 
-                        else if ( (LA11_0=='\"') ) {s = 54;}
+                        else if ( (LA11_0=='@') ) {s = 53;}
 
-                        else if ( (LA11_0=='\'') ) {s = 55;}
+                        else if ( (LA11_0=='\u00A3') ) {s = 54;}
 
-                        else if ( (LA11_0=='_') ) {s = 56;}
+                        else if ( (LA11_0=='\"') ) {s = 55;}
 
-                        else if ( (LA11_0=='A'||(LA11_0>='D' && LA11_0<='H')||(LA11_0>='J' && LA11_0<='K')||LA11_0=='N'||(LA11_0>='P' && LA11_0<='Q')||(LA11_0>='V' && LA11_0<='Z')||(LA11_0>='g' && LA11_0<='h')||(LA11_0>='j' && LA11_0<='k')||LA11_0=='w'||(LA11_0>='y' && LA11_0<='z')) ) {s = 57;}
+                        else if ( (LA11_0=='\'') ) {s = 56;}
 
-                        else if ( ((LA11_0>='0' && LA11_0<='9')) ) {s = 58;}
+                        else if ( (LA11_0=='_') ) {s = 57;}
 
-                        else if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {s = 59;}
+                        else if ( (LA11_0=='A'||(LA11_0>='D' && LA11_0<='H')||(LA11_0>='J' && LA11_0<='K')||LA11_0=='N'||(LA11_0>='P' && LA11_0<='Q')||(LA11_0>='V' && LA11_0<='Z')||LA11_0=='h'||(LA11_0>='j' && LA11_0<='k')||LA11_0=='w'||(LA11_0>='y' && LA11_0<='z')) ) {s = 58;}
 
-                        else if ( ((LA11_0>='\u0000' && LA11_0<='\b')||(LA11_0>='\u000B' && LA11_0<='\f')||(LA11_0>='\u000E' && LA11_0<='\u001F')||(LA11_0>='$' && LA11_0<='%')||LA11_0=='\\'||LA11_0=='^'||LA11_0=='`'||(LA11_0>='~' && LA11_0<='\u00A2')||(LA11_0>='\u00A4' && LA11_0<='\uFFFF')) ) {s = 60;}
+                        else if ( ((LA11_0>='0' && LA11_0<='9')) ) {s = 59;}
 
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA11_54 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA11_54>='\u0000' && LA11_54<='\uFFFF')) ) {s = 168;}
-
-                        else s = 60;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA11_55 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA11_55>='\u0000' && LA11_55<='\uFFFF')) ) {s = 169;}
+                        else if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {s = 60;}
 
-                        else s = 60;
+                        else if ( ((LA11_0>='\u0000' && LA11_0<='\b')||(LA11_0>='\u000B' && LA11_0<='\f')||(LA11_0>='\u000E' && LA11_0<='\u001F')||(LA11_0>='$' && LA11_0<='%')||LA11_0=='\\'||LA11_0=='^'||LA11_0=='`'||(LA11_0>='~' && LA11_0<='\u00A2')||(LA11_0>='\u00A4' && LA11_0<='\uFFFF')) ) {s = 61;}
 
                         if ( s>=0 ) return s;
                         break;
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperativeParser.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperativeParser.java
index 968f1aeda..4484ac20e 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperativeParser.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperativeParser.java
@@ -33,7 +33,7 @@ import java.util.HashMap;
 @SuppressWarnings("all")
 public class InternalQVTimperativeParser extends AbstractInternalContentAssistParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_SINGLE_QUOTED_STRING", "RULE_SIMPLE_ID", "RULE_ESCAPED_ID", "RULE_UNQUOTED_STRING", "RULE_ESCAPED_CHARACTER", "RULE_LETTER_CHARACTER", "RULE_DOUBLE_QUOTED_STRING", "RULE_ML_SINGLE_QUOTED_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "';'", "'check'", "'enforce'", "'import'", "'imports'", "'library'", "'map'", "'query'", "'realize'", "'refines'", "'transformation'", "'uses'", "'!serializable'", "'-'", "'not'", "'*'", "'/'", "'+'", "'>'", "'<'", "'>='", "'<='", "'='", "'<>'", "'and'", "'or'", "'xor'", "'implies'", "'.'", "'->'", "'?.'", "'?->'", "'Map'", "'Tuple'", "'Boolean'", "'Integer'", "'Real'", "'String'", "'UnlimitedNatural'", "'OclAny'", "'OclInvalid'", "'OclVoid'", "'Set'", "'Bag'", "'Sequence'", "'Collection'", "'OrderedSet'", "'|?'", "'?'", "'add'", "'+='", "'observe'", "','", "'append'", "':'", "'var'", "':='", "'in'", "'{'", "'}'", "'call'", "'for'", "'new'", "'out'", "'package'", "'('", "')'", "'::'", "'set'", "'attribute'", "'initial'", "'derivation'", "'datatype'", "'enum'", "'literal'", "'operation'", "'throws'", "'body'", "'property'", "'#'", "'class'", "'extends'", "'..'", "'++'", "'Lambda'", "'<-'", "'invalid'", "'null'", "'pre'", "'['", "']'", "'if'", "'then'", "'else'", "'endif'", "'elseif'", "'let'", "'self'", "'&&'", "'infinite'", "'transient'", "'notify'", "'static'", "'definition'", "'derived'", "'!derived'", "'id'", "'!id'", "'ordered'", "'!ordered'", "'readonly'", "'!readonly'", "'!transient'", "'unique'", "'!unique'", "'unsettable'", "'!unsettable'", "'volatile'", "'!volatile'", "'primitive'", "'serializable'", "'composes'", "'!composes'", "'resolve'", "'!resolve'", "'abstract'", "'interface'", "'true'", "'false'", "'@'", "'|'", "'|1'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_SINGLE_QUOTED_STRING", "RULE_SIMPLE_ID", "RULE_ESCAPED_ID", "RULE_UNQUOTED_STRING", "RULE_ESCAPED_CHARACTER", "RULE_LETTER_CHARACTER", "RULE_DOUBLE_QUOTED_STRING", "RULE_ML_SINGLE_QUOTED_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'call'", "';'", "'check'", "'enforce'", "'import'", "'imports'", "'library'", "'map'", "'query'", "'realize'", "'refines'", "'transformation'", "'uses'", "'!serializable'", "'-'", "'not'", "'*'", "'/'", "'+'", "'>'", "'<'", "'>='", "'<='", "'='", "'<>'", "'and'", "'or'", "'xor'", "'implies'", "'.'", "'->'", "'?.'", "'?->'", "'Map'", "'Tuple'", "'Boolean'", "'Integer'", "'Real'", "'String'", "'UnlimitedNatural'", "'OclAny'", "'OclInvalid'", "'OclVoid'", "'Set'", "'Bag'", "'Sequence'", "'Collection'", "'OrderedSet'", "'|?'", "'?'", "'add'", "'+='", "'observe'", "','", "'appendsTo'", "'append'", "':'", "'buffer'", "':='", "'var'", "'consumes'", "'guard'", "'iterates'", "'{'", "'}'", "'in'", "'for'", "'new'", "'package'", "'('", "')'", "'::'", "'set'", "'attribute'", "'initial'", "'derivation'", "'datatype'", "'enum'", "'literal'", "'operation'", "'throws'", "'body'", "'property'", "'#'", "'class'", "'extends'", "'..'", "'++'", "'Lambda'", "'<-'", "'invalid'", "'null'", "'pre'", "'['", "']'", "'if'", "'then'", "'else'", "'endif'", "'elseif'", "'let'", "'self'", "'&&'", "'infinite'", "'install'", "'invoke'", "'transient'", "'notify'", "'static'", "'definition'", "'derived'", "'!derived'", "'id'", "'!id'", "'ordered'", "'!ordered'", "'readonly'", "'!readonly'", "'!transient'", "'unique'", "'!unique'", "'unsettable'", "'!unsettable'", "'volatile'", "'!volatile'", "'primitive'", "'serializable'", "'composes'", "'!composes'", "'resolve'", "'!resolve'", "'abstract'", "'interface'", "'true'", "'false'", "'@'", "'|'", "'|1'"
     };
     public static final int T__144=144;
     public static final int T__143=143;
@@ -89,6 +89,11 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa
     public static final int T__30=30;
     public static final int T__31=31;
     public static final int T__32=32;
+    public static final int T__154=154;
+    public static final int T__151=151;
+    public static final int T__150=150;
+    public static final int T__153=153;
+    public static final int T__152=152;
     public static final int RULE_SINGLE_QUOTED_STRING=5;
     public static final int T__48=48;
     public static final int T__49=49;
@@ -104,6 +109,7 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa
     public static final int T__147=147;
     public static final int T__42=42;
     public static final int T__43=43;
+    public static final int T__149=149;
     public static final int T__91=91;
     public static final int T__100=100;
     public static final int T__92=92;
@@ -389,12 +395,97 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa
     // $ANTLR end "ruleAddStatementCS"
 
 
+    // $ANTLR start "entryRuleAppendParameterBindingCS"
+    // InternalQVTimperative.g:124:1: entryRuleAppendParameterBindingCS : ruleAppendParameterBindingCS EOF ;
+    public final void entryRuleAppendParameterBindingCS() throws RecognitionException {
+        try {
+            // InternalQVTimperative.g:125:1: ( ruleAppendParameterBindingCS EOF )
+            // InternalQVTimperative.g:126:1: ruleAppendParameterBindingCS EOF
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getAppendParameterBindingCSRule()); 
+            }
+            pushFollow(FollowSets000.FOLLOW_1);
+            ruleAppendParameterBindingCS();
+
+            state._fsp--;
+            if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getAppendParameterBindingCSRule()); 
+            }
+            match(input,EOF,FollowSets000.FOLLOW_2); if (state.failed) return ;
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleAppendParameterBindingCS"
+
+
+    // $ANTLR start "ruleAppendParameterBindingCS"
+    // InternalQVTimperative.g:133:1: ruleAppendParameterBindingCS : ( ( rule__AppendParameterBindingCS__Group__0 ) ) ;
+    public final void ruleAppendParameterBindingCS() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // InternalQVTimperative.g:137:2: ( ( ( rule__AppendParameterBindingCS__Group__0 ) ) )
+            // InternalQVTimperative.g:138:1: ( ( rule__AppendParameterBindingCS__Group__0 ) )
+            {
+            // InternalQVTimperative.g:138:1: ( ( rule__AppendParameterBindingCS__Group__0 ) )
+            // InternalQVTimperative.g:139:1: ( rule__AppendParameterBindingCS__Group__0 )
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getAppendParameterBindingCSAccess().getGroup()); 
+            }
+            // InternalQVTimperative.g:140:1: ( rule__AppendParameterBindingCS__Group__0 )
+            // InternalQVTimperative.g:140:2: rule__AppendParameterBindingCS__Group__0
+            {
+            pushFollow(FollowSets000.FOLLOW_2);
+            rule__AppendParameterBindingCS__Group__0();
+
+            state._fsp--;
+            if (state.failed) return ;
+
+            }
+
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getAppendParameterBindingCSAccess().getGroup()); 
+            }
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleAppendParameterBindingCS"
+
+
     // $ANTLR start "entryRuleAppendParameterCS"
-    // InternalQVTimperative.g:124:1: entryRuleAppendParameterCS : ruleAppendParameterCS EOF ;
+    // InternalQVTimperative.g:152:1: entryRuleAppendParameterCS : ruleAppendParameterCS EOF ;
     public final void entryRuleAppendParameterCS() throws RecognitionException {
         try {
-            // InternalQVTimperative.g:125:1: ( ruleAppendParameterCS EOF )
-            // InternalQVTimperative.g:126:1: ruleAppendParameterCS EOF
+            // InternalQVTimperative.g:153:1: ( ruleAppendParameterCS EOF )
+            // InternalQVTimperative.g:154:1: ruleAppendParameterCS EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAppendParameterCSRule()); 
@@ -424,23 +515,23 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa
 
 
     // $ANTLR start "ruleAppendParameterCS"
-    // InternalQVTimperative.g:133:1: ruleAppendParameterCS : ( ( rule__AppendParameterCS__Group__0 ) ) ;
+    // InternalQVTimperative.g:161:1: ruleAppendParameterCS : ( ( rule__AppendParameterCS__Group__0 ) ) ;
     public final void ruleAppendParameterCS() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // InternalQVTimperative.g:137:2: ( ( ( rule__AppendParameterCS__Group__0 ) ) )
-            // InternalQVTimperative.g:138:1: ( ( rule__AppendParameterCS__Group__0 ) )
+            // InternalQVTimperative.g:165:2: ( ( ( rule__AppendParameterCS__Group__0 ) ) )
+            // InternalQVTimperative.g:166:1: ( ( rule__AppendParameterCS__Group__0 ) )
             {
-            // InternalQVTimperative.g:138:1: ( ( rule__AppendParameterCS__Group__0 ) )
-            // InternalQVTimperative.g:139:1: ( rule__AppendParameterCS__Group__0 )
+            // InternalQVTimperative.g:166:1: ( ( rule__AppendParameterCS__Group__0 ) )
+            // InternalQVTimperative.g:167:1: ( rule__AppendParameterCS__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getAppendParameterCSAccess().getGroup()); 
             }
-            // InternalQVTimperative.g:140:1: ( rule__AppendParameterCS__Group__0 )
-            // InternalQVTimperative.g:140:2: rule__AppendParameterCS__Group__0
+            // InternalQVTimperative.g:168:1: ( rule__AppendParameterCS__Group__0 )
+            // InternalQVTimperative.g:168:2: rule__AppendParameterCS__Group__0
             {
             pushFollow(FollowSets000.FOLLOW_2);
             rule__AppendParameterCS__Group__0();
@@ -474,12 +565,97 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa
     // $ANTLR end "ruleAppendParameterCS"
 
 
+    // $ANTLR start "entryRuleBufferStatementCS"
+    // InternalQVTimperative.g:180:1: entryRuleBufferStatementCS : ruleBufferStatementCS EOF ;
+    public final void entryRuleBufferStatementCS() throws RecognitionException {
+        try {
+            // InternalQVTimperative.g:181:1: ( ruleBufferStatementCS EOF )
+            // InternalQVTimperative.g:182:1: ruleBufferStatementCS EOF
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getBufferStatementCSRule()); 
+            }
+            pushFollow(FollowSets000.FOLLOW_1);
+            ruleBufferStatementCS();
+
+            state._fsp--;
+            if (state.failed) return ;
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getBufferStatementCSRule()); 
+            }
+            match(input,EOF,FollowSets000.FOLLOW_2); if (state.failed) return ;
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleBufferStatementCS"
+
+
+    // $ANTLR start "ruleBufferStatementCS"
+    // InternalQVTimperative.g:189:1: ruleBufferStatementCS : ( ( rule__BufferStatementCS__Group__0 ) ) ;
+    public final void ruleBufferStatementCS() throws RecognitionException {
+
+        		int stackSize = keepStackSize();
+            
+        try {
+            // InternalQVTimperative.g:193:2: ( ( ( rule__BufferStatementCS__Group__0 ) ) )
+            // InternalQVTimperative.g:194:1: ( ( rule__BufferStatementCS__Group__0 ) )
+            {
+            // InternalQVTimperative.g:194:1: ( ( rule__BufferStatementCS__Group__0 ) )
+            // InternalQVTimperative.g:195:1: ( rule__BufferStatementCS__Group__0 )
+            {
+            if ( state.backtracking==0 ) {
+               before(grammarAccess.getBufferStatementCSAccess().getGroup()); 
+            }
+            // InternalQVTimperative.g:196:1: ( rule__BufferStatementCS__Group__0 )
+            // InternalQVTimperative.g:196:2: rule__BufferStatementCS__Group__0
+            {
+            pushFollow(FollowSets000.FOLLOW_2);
+            rule__BufferStatementCS__Group__0();
+
+            state._fsp--;
+            if (state.failed) return ;
+
+            }
+
+            if ( state.backtracking==0 ) {
+               after(grammarAccess.getBufferStatementCSAccess().getGroup()); 
+            }
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+            	restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleBufferStatementCS"
+
+
     // $ANTLR start "entryRuleCommitStatementCS"
-    // InternalQVTimperative.g:152:1: entryRuleCommitStatementCS : ruleCommitStatementCS EOF ;
+    // InternalQVTimperative.g:208:1: entryRuleCommitStatementCS : ruleCommitStatementCS EOF ;
     public final void entryRuleCommitStatementCS() throws RecognitionException {
         try {
-            // InternalQVTimperative.g:153:1: ( ruleCommitStatementCS EOF )
-            // InternalQVTimperative.g:154:1: ruleCommitStatementCS EOF
+            // InternalQVTimperative.g:209:1: ( ruleCommitStatementCS EOF )
+            // InternalQVTimperative.g:210:1: ruleCommitStatementCS EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCommitStatementCSRule()); 
@@ -509,23 +685,23 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa
 
 
     // $ANTLR start "ruleCommitStatementCS"
-    // InternalQVTimperative.g:161:1: ruleCommitStatementCS : ( ( rule__CommitStatementCS__Alternatives ) ) ;
+    // InternalQVTimperative.g:217:1: ruleCommitStatementCS : ( ( rule__CommitStatementCS__Alternatives ) ) ;
     public final void ruleCommitStatementCS() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // InternalQVTimperative.g:165:2: ( ( ( rule__CommitStatementCS__Alternatives ) ) )
-            // InternalQVTimperative.g:166:1: ( ( rule__CommitStatementCS__Alternatives ) )
+            // InternalQVTimperative.g:221:2: ( ( ( rule__CommitStatementCS__Alternatives ) ) )
+            // InternalQVTimperative.g:222:1: ( ( rule__CommitStatementCS__Alternatives ) )
             {
-            // InternalQVTimperative.g:166:1: ( ( rule__CommitStatementCS__Alternatives ) )
-            // InternalQVTimperative.g:167:1: ( rule__CommitStatementCS__Alternatives )
+            // InternalQVTimperative.g:222:1: ( ( rule__CommitStatementCS__Alternatives ) )
+            // InternalQVTimperative.g:223:1: ( rule__CommitStatementCS__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCommitStatementCSAccess().getAlternatives()); 
             }
-            // InternalQVTimperative.g:168:1: ( rule__CommitStatementCS__Alternatives )
-            // InternalQVTimperative.g:168:2: rule__CommitStatementCS__Alternatives
+            // InternalQVTimperative.g:224:1: ( rule__CommitStatementCS__Alternatives )
+            // InternalQVTimperative.g:224:2: rule__CommitStatementCS__Alternatives
             {
             pushFollow(FollowSets000.FOLLOW_2);
             rule__CommitStatementCS__Alternatives();
@@ -560,11 +736,11 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa
 
 
     // $ANTLR start "entryRuleCheckStatementCS"
-    // InternalQVTimperative.g:180:1: entryRuleCheckStatementCS : ruleCheckStatementCS EOF ;
+    // InternalQVTimperative.g:236:1: entryRuleCheckStatementCS : ruleCheckStatementCS EOF ;
     public final void entryRuleCheckStatementCS() throws RecognitionException {
         try {
-            // InternalQVTimperative.g:181:1: ( ruleCheckStatementCS EOF )
-            // InternalQVTimperative.g:182:1: ruleCheckStatementCS EOF
+            // InternalQVTimperative.g:237:1: ( ruleCheckStatementCS EOF )
+            // InternalQVTimperative.g:238:1: ruleCheckStatementCS EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckStatementCSRule()); 
@@ -594,23 +770,23 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa
 
 
     // $ANTLR start "ruleCheckStatementCS"
-    // InternalQVTimperative.g:189:1: ruleCheckStatementCS : ( ( rule__CheckStatementCS__Group__0 ) ) ;
+    // InternalQVTimperative.g:245:1: ruleCheckStatementCS : ( ( rule__CheckStatementCS__Group__0 ) ) ;
     public final void ruleCheckStatementCS() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // InternalQVTimperative.g:193:2: ( ( ( rule__CheckStatementCS__Group__0 ) ) )
-            // InternalQVTimperative.g:194:1: ( ( rule__CheckStatementCS__Group__0 ) )
+            // InternalQVTimperative.g:249:2: ( ( ( rule__CheckStatementCS__Group__0 ) ) )
+            // InternalQVTimperative.g:250:1: ( ( rule__CheckStatementCS__Group__0 ) )
             {
-            // InternalQVTimperative.g:194:1: ( ( rule__CheckStatementCS__Group__0 ) )
-            // InternalQVTimperative.g:195:1: ( rule__CheckStatementCS__Group__0 )
+            // InternalQVTimperative.g:250:1: ( ( rule__CheckStatementCS__Group__0 ) )
+            // InternalQVTimperative.g:251:1: ( rule__CheckStatementCS__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getCheckStatementCSAccess().getGroup()); 
             }
-            // InternalQVTimperative.g:196:1: ( rule__CheckStatementCS__Group__0 )
-            // InternalQVTimperative.g:196:2: rule__CheckStatementCS__Group__0
+            // InternalQVTimperative.g:252:1: ( rule__CheckStatementCS__Group__0 )
+            // InternalQVTimperative.g:252:2: rule__CheckStatementCS__Group__0
             {
             pushFollow(FollowSets000.FOLLOW_2);
             rule__CheckStatementCS__Group__0();
@@ -645,11 +821,11 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa
 
 
     // $ANTLR start "entryRuleControlStatementCS"
-    // InternalQVTimperative.g:208:1: entryRuleControlStatementCS : ruleControlStatementCS EOF ;
+    // InternalQVTimperative.g:264:1: entryRuleControlStatementCS : ruleControlStatementCS EOF ;
     public final void entryRuleControlStatementCS() throws RecognitionException {
         try {
-            // InternalQVTimperative.g:209:1: ( ruleControlStatementCS EOF )
-            // InternalQVTimperative.g:210:1: ruleControlStatementCS EOF
+            // InternalQVTimperative.g:265:1: ( ruleControlStatementCS EOF )
+            // InternalQVTimperative.g:266:1: ruleControlStatementCS EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getControlStatementCSRule()); 
@@ -679,23 +855,23 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa
 
 
     // $ANTLR start "ruleControlStatementCS"
-    // InternalQVTimperative.g:217:1: ruleControlStatementCS : ( ( rule__ControlStatementCS__Alternatives ) ) ;
+    // InternalQVTimperative.g:273:1: ruleControlStatementCS : ( ( rule__ControlStatementCS__Alternatives ) ) ;
     public final void ruleControlStatementCS() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // InternalQVTimperative.g:221:2: ( ( ( rule__ControlStatementCS__Alternatives ) ) )
-            // InternalQVTimperative.g:222:1: ( ( rule__ControlStatementCS__Alternatives ) )
+            // InternalQVTimperative.g:277:2: ( ( ( rule__ControlStatementCS__Alternatives ) ) )
+            // InternalQVTimperative.g:278:1: ( ( rule__ControlStatementCS__Alternatives ) )
             {
-            // InternalQVTimperative.g:222:1: ( ( rule__ControlStatementCS__Alternatives ) )
-            // InternalQVTimperative.g:223:1: ( rule__ControlStatementCS__Alternatives )
+            // InternalQVTimperative.g:278:1: ( ( rule__ControlStatementCS__Alternatives ) )
+            // InternalQVTimperative.g:279:1: ( rule__ControlStatementCS__Alternatives )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getControlStatementCSAccess().getAlternatives()); 
             }
-            // InternalQVTimperative.g:224:1: ( rule__ControlStatementCS__Alternatives )
-            // InternalQVTimperative.g:224:2: rule__ControlStatementCS__Alternatives
+            // InternalQVTimperative.g:280:1: ( rule__ControlStatementCS__Alternatives )
+            // InternalQVTimperative.g:280:2: rule__ControlStatementCS__Alternatives
             {
             pushFollow(FollowSets000.FOLLOW_2);
             rule__ControlStatementCS__Alternatives();
@@ -730,11 +906,11 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa
 
 
     // $ANTLR start "entryRuleDeclareStatementCS"
-    // InternalQVTimperative.g:236:1: entryRuleDeclareStatementCS : ruleDeclareStatementCS EOF ;
+    // InternalQVTimperative.g:292:1: entryRuleDeclareStatementCS : ruleDeclareStatementCS EOF ;
     public final void entryRuleDeclareStatementCS() throws RecognitionException {
         try {
-            // InternalQVTimperative.g:237:1: ( ruleDeclareStatementCS EOF )
-            // InternalQVTimperative.g:238:1: ruleDeclareStatementCS EOF
+            // InternalQVTimperative.g:293:1: ( ruleDeclareStatementCS EOF )
+            // InternalQVTimperative.g:294:1: ruleDeclareStatementCS EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDeclareStatementCSRule()); 
@@ -764,23 +940,23 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa
 
 
     // $ANTLR start "ruleDeclareStatementCS"
-    // InternalQVTimperative.g:245:1: ruleDeclareStatementCS : ( ( rule__DeclareStatementCS__Group__0 ) ) ;
+    // InternalQVTimperative.g:301:1: ruleDeclareStatementCS : ( ( rule__DeclareStatementCS__Group__0 ) ) ;
     public final void ruleDeclareStatementCS() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // InternalQVTimperative.g:249:2: ( ( ( rule__DeclareStatementCS__Group__0 ) ) )
-            // InternalQVTimperative.g:250:1: ( ( rule__DeclareStatementCS__Group__0 ) )
+            // InternalQVTimperative.g:305:2: ( ( ( rule__DeclareStatementCS__Group__0 ) ) )
+            // InternalQVTimperative.g:306:1: ( ( rule__DeclareStatementCS__Group__0 ) )
             {
-            // InternalQVTimperative.g:250:1: ( ( rule__DeclareStatementCS__Group__0 ) )
-            // InternalQVTimperative.g:251:1: ( rule__DeclareStatementCS__Group__0 )
+            // InternalQVTimperative.g:306:1: ( ( rule__DeclareStatementCS__Group__0 ) )
+            // InternalQVTimperative.g:307:1: ( rule__DeclareStatementCS__Group__0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDeclareStatementCSAccess().getGroup()); 
             }
-            // InternalQVTimperative.g:252:1: ( rule__DeclareStatementCS__Group__0 )
-            // InternalQVTimperative.g:252:2: rule__DeclareStatementCS__Group__0
+            // InternalQVTimperative.g:308:1: ( rule__DeclareStatementCS__Group__0 )
+            // InternalQVTimperative.g:308:2: rule__DeclareStatementCS__Group__0
             {
             pushFollow(FollowSets000.FOLLOW_2);
             rule__DeclareStatementCS__Group__0();
@@ -815,11 +991,11 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa
 
 
     // $ANTLR start "entryRuleDirectionCS"
-    // InternalQVTimperative.g:264:1: entryRuleDirectionCS : ruleDirectionCS EOF ;
+    // InternalQVTimperative.g:320:1: entryRuleDirectionCS : ruleDirectionCS EOF ;
     public final void entryRuleDirectionCS() throws RecognitionException {
         try {
-            // InternalQVTimperative.g:265:1: ( ruleDirectionCS EOF )
-            // InternalQVTimperative.g:266:1: ruleDirectionCS EOF
+            // InternalQVTimperative.g:321:1: ( ruleDirectionCS EOF )
+            // InternalQVTimperative.g:322:1: ruleDirectionCS EOF
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getDirectionCSRule()); 
@@ -849,23 +1025,23 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa
 
 
     // $ANTLR start "ruleDirectionCS"
-    // InternalQVTimperative.g:273:1: ruleDirectionCS : ( ( rule__DirectionCS__Group__0 ) ) ;
+    // InternalQVTimperative.g:329:1: ruleDirectionCS : ( ( rule__DirectionCS__Group__0 ) ) ;
     public final void ruleDirectionCS() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // InternalQVTimperative.g:277:2: ( ( ( rule__DirectionCS__Group__0 ) ) )
-            // InternalQVTimperative.g:278:1: ( ( rule__DirectionCS__Group__0 ) )
+            // InternalQVTimperative.g:333:2: ( ( ( rule__DirectionCS__Group__0 ) ) )
+            // InternalQVTimperative.g:334:1: ( ( rule__DirectionCS__Group__0 ) )
             {
-            // InternalQVTimperative.g:278:1: ( ( rule__DirectionCS__Group__0 ) )
-            // InternalQVTimperative.g:279:1: ( rule__DirectionCS__Group__0 )
+            // InternalQVTimperative.g:334:1: ( ( rule__DirectionCS__Group__0 ) )
+            // InternalQVTimperative.g:335:1: ( rule__DirectionCS__Group__0 )
             {
             if ( state.backtracking
author	Ed Willink	2016-09-20 14:59:27 +0000
committer	Ed Willink	2016-09-20 14:59:27 +0000
commit	19fbb0bb120023636c855455350a1c40aa5f8fbf (patch)
tree	1ca91a8fb321430b200bda899d445006d0a07ab4 /plugins
parent	f2a5093c703790389fa0e72bf7ab73e446440766 (diff)
download	org.eclipse.qvtd-19fbb0bb120023636c855455350a1c40aa5f8fbf.tar.gz org.eclipse.qvtd-19fbb0bb120023636c855455350a1c40aa5f8fbf.tar.xz org.eclipse.qvtd-19fbb0bb120023636c855455350a1c40aa5f8fbf.zip