Removed IReadOnlyQueryEnvironment from AstBuilderListener.

Change-Id: Ia54366216b6dd4531c4fb6505cf7b576f3cf1f86
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateBinding_type_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateBinding_type_ClassTypeLiteral.gif
new file mode 100644
index 0000000..87bf925
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateBinding_type_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateBinding_type_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateBinding_type_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..cba6836
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateBinding_type_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateBinding_value_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateBinding_value_ClassTypeLiteral.gif
new file mode 100644
index 0000000..87bf925
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateBinding_value_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateBinding_value_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateBinding_value_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..cba6836
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateBinding_value_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateCall_arguments_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateCall_arguments_ClassTypeLiteral.gif
new file mode 100644
index 0000000..3951fc1
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateCall_arguments_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateCall_arguments_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateCall_arguments_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..98e70dd
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateCall_arguments_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateCollectionTypeLiteral_elementType_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateCollectionTypeLiteral_elementType_ClassTypeLiteral.gif
new file mode 100644
index 0000000..c022715
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateCollectionTypeLiteral_elementType_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateCollectionTypeLiteral_elementType_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateCollectionTypeLiteral_elementType_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..dd977db
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateCollectionTypeLiteral_elementType_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_falseBranch_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_falseBranch_ClassTypeLiteral.gif
new file mode 100644
index 0000000..e91f6dd
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_falseBranch_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_falseBranch_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_falseBranch_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..49d948b
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_falseBranch_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_predicate_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_predicate_ClassTypeLiteral.gif
new file mode 100644
index 0000000..e91f6dd
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_predicate_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_predicate_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_predicate_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..49d948b
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_predicate_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_trueBranch_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_trueBranch_ClassTypeLiteral.gif
new file mode 100644
index 0000000..e91f6dd
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_trueBranch_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_trueBranch_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_trueBranch_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..49d948b
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateConditional_trueBranch_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateExpression_aql_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateExpression_aql_ClassTypeLiteral.gif
new file mode 100644
index 0000000..a675390
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateExpression_aql_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateExpression_aql_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateExpression_aql_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..755e4ca
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateExpression_aql_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateLambda_expression_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateLambda_expression_ClassTypeLiteral.gif
new file mode 100644
index 0000000..f6b0168
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateLambda_expression_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateLambda_expression_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateLambda_expression_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..86d00fa
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateLambda_expression_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateLet_body_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateLet_body_ClassTypeLiteral.gif
new file mode 100644
index 0000000..99a4283
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateLet_body_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateLet_body_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateLet_body_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..2769bc6
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateLet_body_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateSequenceInExtensionLiteral_values_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateSequenceInExtensionLiteral_values_ClassTypeLiteral.gif
new file mode 100644
index 0000000..a675390
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateSequenceInExtensionLiteral_values_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateSequenceInExtensionLiteral_values_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateSequenceInExtensionLiteral_values_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..755e4ca
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateSequenceInExtensionLiteral_values_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateSetInExtensionLiteral_values_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateSetInExtensionLiteral_values_ClassTypeLiteral.gif
new file mode 100644
index 0000000..bccc676
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateSetInExtensionLiteral_values_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateSetInExtensionLiteral_values_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateSetInExtensionLiteral_values_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..9d4ac00
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateSetInExtensionLiteral_values_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateTypeSetLiteral_types_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateTypeSetLiteral_types_ClassTypeLiteral.gif
new file mode 100644
index 0000000..f047d5c
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateTypeSetLiteral_types_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateTypeSetLiteral_types_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateTypeSetLiteral_types_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..f296b31
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateTypeSetLiteral_types_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateTypedElement_typeAql_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateTypedElement_typeAql_ClassTypeLiteral.gif
new file mode 100644
index 0000000..a6fdabb
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateTypedElement_typeAql_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateTypedElement_typeAql_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateTypedElement_typeAql_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..84084d8
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateTypedElement_typeAql_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateVariableDeclaration_type_ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateVariableDeclaration_type_ClassTypeLiteral.gif
new file mode 100644
index 0000000..b77c059
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateVariableDeclaration_type_ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateVariableDeclaration_type_EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateVariableDeclaration_type_EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..ad78deb
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/ctool16/CreateVariableDeclaration_type_EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/obj16/ClassTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/obj16/ClassTypeLiteral.gif
new file mode 100644
index 0000000..1e5345f
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/obj16/ClassTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/icons/full/obj16/EClassifierTypeLiteral.gif b/plugins/org.eclipse.acceleo.aql.edit/icons/full/obj16/EClassifierTypeLiteral.gif
new file mode 100644
index 0000000..b3643da
--- /dev/null
+++ b/plugins/org.eclipse.acceleo.aql.edit/icons/full/obj16/EClassifierTypeLiteral.gif
Binary files differ
diff --git a/plugins/org.eclipse.acceleo.aql.edit/plugin.properties b/plugins/org.eclipse.acceleo.aql.edit/plugin.properties
index 25e250a..157eec9 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/plugin.properties
+++ b/plugins/org.eclipse.acceleo.aql.edit/plugin.properties
@@ -267,3 +267,12 @@
 _UI_NewLineStatement_type = New Line Statement
 _UI_NewLineStatement_indentationNeeded_feature = Indentation Needed
 _UI_Block_inlined_feature = Inlined
+_UI_EClassifierTypeLiteral_type = EClassifier Type Literal
+_UI_ClassTypeLiteral_type = Class Type Literal
+_UI_EnumLiteral_ePackageName_feature = EPackage Name
+_UI_EnumLiteral_eEnumName_feature = EEnum Name
+_UI_EnumLiteral_eEnumLiteralName_feature = EEnum Literal Name
+_UI_EClassifierTypeLiteral_ePackageName_feature = EPackage Name
+_UI_EClassifierTypeLiteral_eClassifierName_feature = EClassifier Name
+_UI_ClassTypeLiteral_value_feature = Value
+_UI_ErrorEClassifierTypeLiteral_missingColon_feature = Missing Colon
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/AcceleoEditPlugin.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/AcceleoEditPlugin.java
index 7920731..e64431f 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/AcceleoEditPlugin.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/AcceleoEditPlugin.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,36 +12,32 @@
 package org.eclipse.acceleo.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
-
 import org.eclipse.emf.common.util.ResourceLocator;
 
 /**
- * This is the central singleton for the Acceleo edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the central singleton for the Acceleo edit plugin. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public final class AcceleoEditPlugin extends EMFPlugin {
 	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final AcceleoEditPlugin INSTANCE = new AcceleoEditPlugin();
 
 	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
 
 	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AcceleoEditPlugin() {
@@ -49,9 +45,9 @@
 	}
 
 	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
+	 * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -61,9 +57,9 @@
 	}
 
 	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
+	 * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -72,16 +68,15 @@
 	}
 
 	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The actual implementation of the Eclipse <b>Plugin</b>. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static class Implementation extends EclipsePlugin {
 		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		public Implementation() {
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/AcceleoItemProviderAdapterFactory.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/AcceleoItemProviderAdapterFactory.java
index 42f11f8..2759df1 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/AcceleoItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/AcceleoItemProviderAdapterFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -31,44 +31,46 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 
 /**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the factory that is used to provide the interfaces needed to support
+ * Viewers. The adapters generated by this factory convert EMF adapter
+ * notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The
+ * adapters also support Eclipse property sheets. Note that most of the adapters
+ * are shared among multiple instances. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class AcceleoItemProviderAdapterFactory extends AcceleoAdapterFactory
 		implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the root adapter factory that delegates to this adapter
+	 * factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
 
 	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is used to implement
+	 * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
 
 	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of all the supported types checked by
+	 * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
 
 	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AcceleoItemProviderAdapterFactory() {
@@ -80,17 +82,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.Module} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.Module} instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ModuleItemProvider moduleItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.Module}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.Module}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -103,17 +106,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorModule} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorModule} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorModuleItemProvider errorModuleItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorModule}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorModule}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -126,17 +130,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.Metamodel} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.Metamodel} instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MetamodelItemProvider metamodelItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.Metamodel}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.Metamodel}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -149,17 +154,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorMetamodel} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorMetamodel} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorMetamodelItemProvider errorMetamodelItemProvider;
 
 	/**
 	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorMetamodel}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -172,17 +178,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.Import} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.Import} instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ImportItemProvider importItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.Import}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.Import}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -195,17 +202,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorImport} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorImport} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorImportItemProvider errorImportItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorImport}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorImport}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -218,17 +226,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ModuleReference} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ModuleReference} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ModuleReferenceItemProvider moduleReferenceItemProvider;
 
 	/**
 	 * This creates an adapter for a {@link org.eclipse.acceleo.ModuleReference}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -241,17 +250,19 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorModuleReference} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorModuleReference} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorModuleReferenceItemProvider errorModuleReferenceItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorModuleReference}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a
+	 * {@link org.eclipse.acceleo.ErrorModuleReference}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -264,17 +275,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.Comment} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.Comment} instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CommentItemProvider commentItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.Comment}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.Comment}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,17 +299,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.BlockComment} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.BlockComment} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BlockCommentItemProvider blockCommentItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.BlockComment}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.BlockComment}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -310,17 +323,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorBlockComment} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorBlockComment} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorBlockCommentItemProvider errorBlockCommentItemProvider;
 
 	/**
 	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorBlockComment}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -333,17 +347,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorComment} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorComment} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorCommentItemProvider errorCommentItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorComment}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorComment}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -356,17 +371,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.CommentBody} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.CommentBody} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CommentBodyItemProvider commentBodyItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.CommentBody}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.CommentBody}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -379,17 +395,19 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ModuleDocumentation} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ModuleDocumentation} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ModuleDocumentationItemProvider moduleDocumentationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ModuleDocumentation}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a
+	 * {@link org.eclipse.acceleo.ModuleDocumentation}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -402,17 +420,19 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorModuleDocumentation} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorModuleDocumentation} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorModuleDocumentationItemProvider errorModuleDocumentationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorModuleDocumentation}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a
+	 * {@link org.eclipse.acceleo.ErrorModuleDocumentation}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -425,17 +445,19 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ModuleElementDocumentation} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ModuleElementDocumentation} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ModuleElementDocumentationItemProvider moduleElementDocumentationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ModuleElementDocumentation}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a
+	 * {@link org.eclipse.acceleo.ModuleElementDocumentation}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -448,17 +470,19 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorModuleElementDocumentation} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorModuleElementDocumentation} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorModuleElementDocumentationItemProvider errorModuleElementDocumentationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorModuleElementDocumentation}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a
+	 * {@link org.eclipse.acceleo.ErrorModuleElementDocumentation}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -471,17 +495,19 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ParameterDocumentation} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ParameterDocumentation} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ParameterDocumentationItemProvider parameterDocumentationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ParameterDocumentation}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a
+	 * {@link org.eclipse.acceleo.ParameterDocumentation}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -494,17 +520,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.Block} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.Block} instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BlockItemProvider blockItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.Block}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.Block}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -517,17 +544,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.TypedElement} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.TypedElement} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TypedElementItemProvider typedElementItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.TypedElement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.TypedElement}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -540,17 +568,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.Template} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.Template} instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TemplateItemProvider templateItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.Template}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.Template}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -563,17 +592,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorTemplate} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorTemplate} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorTemplateItemProvider errorTemplateItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorTemplate}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorTemplate}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -586,17 +616,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.Query} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.Query} instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected QueryItemProvider queryItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.Query}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.Query}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -609,17 +640,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorQuery} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorQuery} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorQueryItemProvider errorQueryItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorQuery}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorQuery}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -632,17 +664,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.Expression} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.Expression} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ExpressionItemProvider expressionItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.Expression}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.Expression}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -655,17 +688,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorExpression} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorExpression} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorExpressionItemProvider errorExpressionItemProvider;
 
 	/**
 	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorExpression}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -678,17 +712,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.Variable} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.Variable} instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VariableItemProvider variableItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.Variable}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.Variable}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -701,17 +736,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorVariable} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorVariable} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorVariableItemProvider errorVariableItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorVariable}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorVariable}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -724,17 +760,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.Binding} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.Binding} instances. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BindingItemProvider bindingItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.Binding}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.Binding}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -747,17 +784,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorBinding} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorBinding} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorBindingItemProvider errorBindingItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorBinding}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorBinding}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -770,17 +808,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.LeafStatement} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.LeafStatement} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LeafStatementItemProvider leafStatementItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.LeafStatement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.LeafStatement}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -793,17 +832,19 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ExpressionStatement} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ExpressionStatement} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ExpressionStatementItemProvider expressionStatementItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ExpressionStatement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a
+	 * {@link org.eclipse.acceleo.ExpressionStatement}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -816,17 +857,19 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorExpressionStatement} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorExpressionStatement} instances. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorExpressionStatementItemProvider errorExpressionStatementItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorExpressionStatement}.
-	 * <!-- begin-user-doc -->
+	 * This creates an adapter for a
+	 * {@link org.eclipse.acceleo.ErrorExpressionStatement}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -839,17 +882,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ProtectedArea} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ProtectedArea} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ProtectedAreaItemProvider protectedAreaItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ProtectedArea}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.ProtectedArea}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -862,17 +906,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorProtectedArea} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorProtectedArea} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorProtectedAreaItemProvider errorProtectedAreaItemProvider;
 
 	/**
 	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorProtectedArea}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -885,17 +930,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ForStatement} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ForStatement} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ForStatementItemProvider forStatementItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.ForStatement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.ForStatement}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -908,17 +954,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorForStatement} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorForStatement} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorForStatementItemProvider errorForStatementItemProvider;
 
 	/**
 	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorForStatement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -931,17 +978,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.IfStatement} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.IfStatement} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IfStatementItemProvider ifStatementItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.IfStatement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.IfStatement}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -954,17 +1002,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorIfStatement} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorIfStatement} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorIfStatementItemProvider errorIfStatementItemProvider;
 
 	/**
 	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorIfStatement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -977,17 +1026,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.LetStatement} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.LetStatement} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LetStatementItemProvider letStatementItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.LetStatement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.LetStatement}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1000,17 +1050,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorLetStatement} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorLetStatement} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorLetStatementItemProvider errorLetStatementItemProvider;
 
 	/**
 	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorLetStatement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1023,17 +1074,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.FileStatement} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.FileStatement} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	protected FileStatementItemProviderSpec fileStatementItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.FileStatement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.FileStatement}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	@Override
@@ -1046,17 +1098,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.ErrorFileStatement} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.ErrorFileStatement} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorFileStatementItemProvider errorFileStatementItemProvider;
 
 	/**
 	 * This creates an adapter for a {@link org.eclipse.acceleo.ErrorFileStatement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1069,17 +1122,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.TextStatement} instances.
-	 * <!-- begin-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.TextStatement} instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TextStatementItemProvider textStatementItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.acceleo.TextStatement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an adapter for a {@link org.eclipse.acceleo.TextStatement}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1092,17 +1146,18 @@
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.acceleo.NewLineStatement} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.acceleo.NewLineStatement} instances. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected NewLineStatementItemProvider newLineStatementItemProvider;
 
 	/**
 	 * This creates an adapter for a {@link org.eclipse.acceleo.NewLineStatement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1115,9 +1170,9 @@
 	}
 
 	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the root adapter factory that contains this factory. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ComposeableAdapterFactory getRootAdapterFactory() {
@@ -1125,9 +1180,9 @@
 	}
 
 	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This sets the composed adapter factory that contains this factory. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
@@ -1135,8 +1190,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1145,9 +1200,9 @@
 	}
 
 	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This implementation substitutes the factory itself as the key for the
+	 * adapter. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1156,8 +1211,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1173,9 +1228,8 @@
 	}
 
 	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -1183,9 +1237,8 @@
 	}
 
 	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -1193,9 +1246,9 @@
 	}
 
 	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This delegates to {@link #changeNotifier} and to
+	 * {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void fireNotifyChanged(Notification notification) {
@@ -1207,9 +1260,9 @@
 	}
 
 	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This disposes all of the item providers created by this factory. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void dispose() {
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/BindingItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/BindingItemProvider.java
index c240991..13919d5 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/BindingItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/BindingItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,26 +17,23 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.Binding;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.Binding} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.acceleo.Binding}
+ * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class BindingItemProvider extends VariableItemProvider {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BindingItemProvider(AdapterFactory adapterFactory) {
@@ -44,9 +41,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -59,11 +56,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,22 +74,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns Binding.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns Binding.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -100,9 +98,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,10 +111,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -132,10 +130,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/BlockCommentItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/BlockCommentItemProvider.java
index 664adc8..28dcc46 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/BlockCommentItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/BlockCommentItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,20 +16,20 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.BlockComment} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.BlockComment} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class BlockCommentItemProvider extends CommentItemProvider {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BlockCommentItemProvider(AdapterFactory adapterFactory) {
@@ -37,9 +37,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -52,9 +52,8 @@
 	}
 
 	/**
-	 * This returns BlockComment.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns BlockComment.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -63,9 +62,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,10 +73,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,10 +86,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/BlockItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/BlockItemProvider.java
index c6091a2..a583ac8 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/BlockItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/BlockItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.Block;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -37,17 +33,17 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.Block} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.acceleo.Block}
+ * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class BlockItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public BlockItemProvider(AdapterFactory adapterFactory) {
@@ -55,9 +51,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -71,9 +67,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Inlined feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Inlined feature. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addInlinedPropertyDescriptor(Object object) {
@@ -86,11 +82,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -103,22 +100,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns Block.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns Block.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,9 +124,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -139,10 +136,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -161,10 +158,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -245,9 +242,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/CommentBodyItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/CommentBodyItemProvider.java
index 58e7947..2b3f072 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/CommentBodyItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/CommentBodyItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,12 +16,9 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.CommentBody;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -34,17 +31,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.CommentBody} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.CommentBody} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class CommentBodyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public CommentBodyItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +50,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,9 +66,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Value feature. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addValuePropertyDescriptor(Object object) {
@@ -84,9 +82,8 @@
 	}
 
 	/**
-	 * This returns CommentBody.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns CommentBody.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -95,9 +92,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -108,10 +105,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,10 +124,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -139,9 +136,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/CommentItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/CommentItemProvider.java
index c421f2b..a21575e 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/CommentItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/CommentItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,26 +17,23 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.Comment;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.Comment} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.acceleo.Comment}
+ * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class CommentItemProvider extends ModuleElementItemProvider {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public CommentItemProvider(AdapterFactory adapterFactory) {
@@ -44,9 +41,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -59,11 +56,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,22 +74,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns Comment.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns Comment.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -100,9 +98,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -111,10 +109,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -130,10 +128,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorBindingItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorBindingItemProvider.java
index 58d3baf..39637ca 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorBindingItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorBindingItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -34,17 +34,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorBinding} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorBinding} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorBindingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorBindingItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +53,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,9 +75,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
@@ -90,9 +91,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
@@ -106,9 +107,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Name feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingNamePropertyDescriptor(Object object) {
@@ -122,9 +123,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Colon feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Colon feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingColonPropertyDescriptor(Object object) {
@@ -138,9 +139,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Type feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingTypePropertyDescriptor(Object object) {
@@ -155,8 +156,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Affectation Symbole feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingAffectationSymbolePropertyDescriptor(Object object) {
@@ -170,9 +171,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Affectation Symbole Position feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Affectation Symbole Position
+	 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingAffectationSymbolePositionPropertyDescriptor(Object object) {
@@ -186,11 +187,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -204,22 +206,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorBinding.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorBinding.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -228,9 +230,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -241,10 +243,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -269,10 +271,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -304,7 +306,10 @@
 				AstFactory.eINSTANCE.createEnumLiteral()));
 
 		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
-				AstFactory.eINSTANCE.createTypeLiteral()));
+				AstFactory.eINSTANCE.createEClassifierTypeLiteral()));
+
+		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
+				AstFactory.eINSTANCE.createClassTypeLiteral()));
 
 		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
 				AstFactory.eINSTANCE.createTypeSetLiteral()));
@@ -374,9 +379,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorBlockCommentItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorBlockCommentItemProvider.java
index b66f0aa..02e6ad3 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorBlockCommentItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorBlockCommentItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -15,23 +15,22 @@
 import java.util.List;
 
 import org.eclipse.acceleo.ErrorBlockComment;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorBlockComment} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorBlockComment} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorBlockCommentItemProvider extends ErrorCommentItemProvider {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorBlockCommentItemProvider(AdapterFactory adapterFactory) {
@@ -39,9 +38,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -54,9 +53,9 @@
 	}
 
 	/**
-	 * This returns ErrorBlockComment.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorBlockComment.gif. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -65,9 +64,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -77,10 +76,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -90,10 +89,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorCommentItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorCommentItemProvider.java
index 317b455..728e5cf 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorCommentItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorCommentItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorComment;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -37,17 +33,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorComment} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorComment} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorCommentItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorCommentItemProvider(AdapterFactory adapterFactory) {
@@ -55,9 +52,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -71,9 +68,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End Header feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End Header feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndHeaderPropertyDescriptor(Object object) {
@@ -87,11 +84,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -104,22 +102,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorComment.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorComment.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,9 +126,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -140,10 +138,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,10 +160,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -177,9 +175,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorExpressionItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorExpressionItemProvider.java
index 98faed4..3fbcb6f 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorExpressionItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorExpressionItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -34,17 +34,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorExpression} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorExpression} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorExpressionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorExpressionItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +53,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,9 +69,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Ast feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Ast feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAstPropertyDescriptor(Object object) {
@@ -84,11 +85,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -101,22 +103,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorExpression.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorExpression.gif. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -125,9 +128,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -139,10 +142,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -161,10 +164,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -196,7 +199,10 @@
 				AstFactory.eINSTANCE.createEnumLiteral()));
 
 		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.EXPRESSION__AQL,
-				AstFactory.eINSTANCE.createTypeLiteral()));
+				AstFactory.eINSTANCE.createEClassifierTypeLiteral()));
+
+		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.EXPRESSION__AQL,
+				AstFactory.eINSTANCE.createClassTypeLiteral()));
 
 		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.EXPRESSION__AQL,
 				AstFactory.eINSTANCE.createTypeSetLiteral()));
@@ -260,9 +266,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorExpressionStatementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorExpressionStatementItemProvider.java
index 3729fe4..25b7d46 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorExpressionStatementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorExpressionStatementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,12 +16,9 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorExpressionStatement;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -34,17 +31,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorExpressionStatement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorExpressionStatement} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorExpressionStatementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorExpressionStatementItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +50,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -70,9 +68,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the New Line Needed feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the New Line Needed feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNewLineNeededPropertyDescriptor(Object object) {
@@ -86,9 +84,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Expression feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Expression feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addExpressionPropertyDescriptor(Object object) {
@@ -101,9 +99,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End Header feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End Header feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndHeaderPropertyDescriptor(Object object) {
@@ -117,9 +115,9 @@
 	}
 
 	/**
-	 * This returns ErrorExpressionStatement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorExpressionStatement.gif. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,9 +126,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -140,10 +138,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -160,10 +158,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -172,9 +170,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorFileStatementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorFileStatementItemProvider.java
index 4a14b02..5b99255 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorFileStatementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorFileStatementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -18,14 +18,10 @@
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorFileStatement;
 import org.eclipse.acceleo.OpenModeKind;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -38,17 +34,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorFileStatement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorFileStatement} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorFileStatementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorFileStatementItemProvider(AdapterFactory adapterFactory) {
@@ -56,9 +53,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -78,9 +75,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Mode feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Mode feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addModePropertyDescriptor(Object object) {
@@ -95,8 +92,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Open Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingOpenParenthesisPropertyDescriptor(Object object) {
@@ -110,9 +107,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Comma feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Comma feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingCommaPropertyDescriptor(Object object) {
@@ -126,9 +123,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Open Mode feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Open Mode feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingOpenModePropertyDescriptor(Object object) {
@@ -143,8 +140,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Close Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingCloseParenthesisPropertyDescriptor(Object object) {
@@ -158,9 +155,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End Header feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End Header feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndHeaderPropertyDescriptor(Object object) {
@@ -174,9 +171,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndPropertyDescriptor(Object object) {
@@ -190,11 +187,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -209,22 +207,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorFileStatement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorFileStatement.gif. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -233,9 +232,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -247,10 +246,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -277,10 +276,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -304,9 +303,10 @@
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for
+	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -325,9 +325,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorForStatementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorForStatementItemProvider.java
index ad5880f..1a9603b 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorForStatementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorForStatementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorForStatement;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -37,17 +33,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorForStatement} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorForStatement} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorForStatementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorForStatementItemProvider(AdapterFactory adapterFactory) {
@@ -55,9 +52,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -77,8 +74,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Open Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingOpenParenthesisPropertyDescriptor(Object object) {
@@ -92,9 +89,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Binding feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Binding feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingBindingPropertyDescriptor(Object object) {
@@ -109,8 +106,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Close Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingCloseParenthesisPropertyDescriptor(Object object) {
@@ -124,9 +121,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Separator Close Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Separator Close Parenthesis
+	 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingSeparatorCloseParenthesisPropertyDescriptor(Object object) {
@@ -140,9 +137,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End Header feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End Header feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndHeaderPropertyDescriptor(Object object) {
@@ -156,9 +153,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndPropertyDescriptor(Object object) {
@@ -172,11 +169,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -191,22 +189,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorForStatement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorForStatement.gif. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -215,9 +214,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -227,10 +226,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -256,10 +255,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -283,9 +282,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorIfStatementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorIfStatementItemProvider.java
index 9db8cf5..ec424b3 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorIfStatementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorIfStatementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorIfStatement;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -37,17 +33,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorIfStatement} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorIfStatement} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorIfStatementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorIfStatementItemProvider(AdapterFactory adapterFactory) {
@@ -55,9 +52,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -75,8 +72,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Open Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingOpenParenthesisPropertyDescriptor(Object object) {
@@ -91,8 +88,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Close Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingCloseParenthesisPropertyDescriptor(Object object) {
@@ -106,9 +103,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End Header feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End Header feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndHeaderPropertyDescriptor(Object object) {
@@ -122,9 +119,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndPropertyDescriptor(Object object) {
@@ -138,11 +135,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -157,22 +155,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorIfStatement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorIfStatement.gif. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -181,9 +180,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -193,10 +192,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -220,10 +219,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -244,9 +243,10 @@
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for
+	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -265,9 +265,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorImportItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorImportItemProvider.java
index b97dece..94c12cc 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorImportItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorImportItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorImport;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -37,17 +33,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorImport} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorImport} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorImportItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorImportItemProvider(AdapterFactory adapterFactory) {
@@ -55,9 +52,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -71,9 +68,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndPropertyDescriptor(Object object) {
@@ -87,11 +84,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -104,22 +102,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorImport.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorImport.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,9 +126,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -140,10 +138,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,10 +160,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -180,9 +178,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorLetStatementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorLetStatementItemProvider.java
index 16538b1..8cb3ffc 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorLetStatementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorLetStatementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorLetStatement;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -37,17 +33,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorLetStatement} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorLetStatement} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorLetStatementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorLetStatementItemProvider(AdapterFactory adapterFactory) {
@@ -55,9 +52,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,9 +70,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Bindings feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Bindings feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingBindingsPropertyDescriptor(Object object) {
@@ -89,9 +86,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End Header feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End Header feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndHeaderPropertyDescriptor(Object object) {
@@ -105,9 +102,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndPropertyDescriptor(Object object) {
@@ -121,11 +118,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -139,22 +137,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorLetStatement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorLetStatement.gif. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -163,9 +162,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -175,10 +174,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -200,10 +199,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -221,9 +220,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorMetamodelItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorMetamodelItemProvider.java
index 0b24e32..4d4820e 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorMetamodelItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorMetamodelItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,12 +16,9 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorMetamodel;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -34,17 +31,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorMetamodel} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorMetamodel} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorMetamodelItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorMetamodelItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +50,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -70,9 +68,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Referenced Package feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Referenced Package feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addReferencedPackagePropertyDescriptor(Object object) {
@@ -85,9 +83,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Fragment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Fragment feature. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addFragmentPropertyDescriptor(Object object) {
@@ -101,9 +99,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End Quote feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End Quote feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndQuotePropertyDescriptor(Object object) {
@@ -117,9 +115,9 @@
 	}
 
 	/**
-	 * This returns ErrorMetamodel.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorMetamodel.gif. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,9 +126,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -141,10 +139,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -161,10 +159,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -173,9 +171,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleDocumentationItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleDocumentationItemProvider.java
index 9bff809..1d1391a 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleDocumentationItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleDocumentationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorModuleDocumentation;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -37,17 +33,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorModuleDocumentation} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorModuleDocumentation} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorModuleDocumentationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorModuleDocumentationItemProvider(AdapterFactory adapterFactory) {
@@ -55,9 +52,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,9 +71,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Author feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Author feature. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAuthorPropertyDescriptor(Object object) {
@@ -90,9 +87,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Version feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Version feature. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addVersionPropertyDescriptor(Object object) {
@@ -106,9 +103,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Since feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Since feature. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSincePropertyDescriptor(Object object) {
@@ -122,9 +119,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End Header feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End Header feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndHeaderPropertyDescriptor(Object object) {
@@ -138,11 +135,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -155,22 +153,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorModuleDocumentation.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorModuleDocumentation.gif. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -179,9 +178,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -192,10 +191,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -217,10 +216,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -232,9 +231,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleElementDocumentationItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleElementDocumentationItemProvider.java
index 328b79d..956351b 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleElementDocumentationItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleElementDocumentationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorModuleElementDocumentation;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -37,18 +33,19 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorModuleElementDocumentation} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorModuleElementDocumentation} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorModuleElementDocumentationItemProvider extends ItemProviderAdapter
 		implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
 		IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorModuleElementDocumentationItemProvider(AdapterFactory adapterFactory) {
@@ -56,9 +53,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -72,9 +69,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End Header feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End Header feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndHeaderPropertyDescriptor(Object object) {
@@ -89,11 +86,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -107,22 +105,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorModuleElementDocumentation.gif.
-	 * <!-- begin-user-doc -->
+	 * This returns ErrorModuleElementDocumentation.gif. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -131,9 +130,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -144,10 +143,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -167,10 +166,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -186,9 +185,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleItemProvider.java
index be249db..caba67c 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorModule;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -37,17 +33,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorModule} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorModule} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorModuleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorModuleItemProvider(AdapterFactory adapterFactory) {
@@ -55,9 +52,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -82,9 +79,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
@@ -98,9 +95,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Deprecated feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Deprecated feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDeprecatedPropertyDescriptor(Object object) {
@@ -114,9 +111,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Metamodels feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Metamodels feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMetamodelsPropertyDescriptor(Object object) {
@@ -129,9 +126,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Extends feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Extends feature. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addExtendsPropertyDescriptor(Object object) {
@@ -144,9 +141,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Imports feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Imports feature. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addImportsPropertyDescriptor(Object object) {
@@ -159,9 +156,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Start Header Position feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Start Header Position feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStartHeaderPositionPropertyDescriptor(Object object) {
@@ -175,9 +172,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the End Header Position feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the End Header Position feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addEndHeaderPositionPropertyDescriptor(Object object) {
@@ -191,9 +188,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Ast feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Ast feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAstPropertyDescriptor(Object object) {
@@ -207,8 +204,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Open Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingOpenParenthesisPropertyDescriptor(Object object) {
@@ -222,9 +219,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing EPackage feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing EPackage feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEPackagePropertyDescriptor(Object object) {
@@ -239,8 +236,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Close Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingCloseParenthesisPropertyDescriptor(Object object) {
@@ -254,9 +251,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End Header feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End Header feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndHeaderPropertyDescriptor(Object object) {
@@ -270,11 +267,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -288,22 +286,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorModule.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorModule.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -312,9 +310,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -325,10 +323,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -358,10 +356,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -421,9 +419,10 @@
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for
+	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -442,9 +441,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleReferenceItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleReferenceItemProvider.java
index 93e315c..4b7acc2 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleReferenceItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorModuleReferenceItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,12 +16,9 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorModuleReference;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -34,17 +31,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorModuleReference} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorModuleReference} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorModuleReferenceItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorModuleReferenceItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +50,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,9 +66,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Qualified Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Qualified Name feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addQualifiedNamePropertyDescriptor(Object object) {
@@ -84,9 +82,9 @@
 	}
 
 	/**
-	 * This returns ErrorModuleReference.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorModuleReference.gif. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -95,9 +93,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -108,10 +106,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,10 +125,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -139,9 +137,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorProtectedAreaItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorProtectedAreaItemProvider.java
index f8e646c..037ac35 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorProtectedAreaItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorProtectedAreaItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorProtectedArea;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -37,17 +33,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorProtectedArea} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorProtectedArea} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorProtectedAreaItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorProtectedAreaItemProvider(AdapterFactory adapterFactory) {
@@ -55,9 +52,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -75,8 +72,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Open Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingOpenParenthesisPropertyDescriptor(Object object) {
@@ -91,8 +88,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Close Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingCloseParenthesisPropertyDescriptor(Object object) {
@@ -106,9 +103,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End Header feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End Header feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndHeaderPropertyDescriptor(Object object) {
@@ -122,9 +119,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndPropertyDescriptor(Object object) {
@@ -138,11 +135,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -156,22 +154,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorProtectedArea.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorProtectedArea.gif. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -180,9 +179,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -192,10 +191,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -218,10 +217,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -239,9 +238,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorQueryItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorQueryItemProvider.java
index 48ae7cb..df5ab7a 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorQueryItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorQueryItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -34,17 +34,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorQuery} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorQuery} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorQueryItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorQueryItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +53,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -81,9 +82,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Deprecated feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Deprecated feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDeprecatedPropertyDescriptor(Object object) {
@@ -97,9 +98,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
@@ -113,9 +114,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
@@ -129,9 +130,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Visibility feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Visibility feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addVisibilityPropertyDescriptor(Object object) {
@@ -145,9 +146,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Body feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Body feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addBodyPropertyDescriptor(Object object) {
@@ -159,9 +160,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Visibility feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Visibility feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingVisibilityPropertyDescriptor(Object object) {
@@ -175,9 +176,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Name feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingNamePropertyDescriptor(Object object) {
@@ -192,8 +193,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Open Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingOpenParenthesisPropertyDescriptor(Object object) {
@@ -207,9 +208,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Parameters feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Parameters feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingParametersPropertyDescriptor(Object object) {
@@ -224,8 +225,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Close Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingCloseParenthesisPropertyDescriptor(Object object) {
@@ -239,9 +240,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Colon feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Colon feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingColonPropertyDescriptor(Object object) {
@@ -255,9 +256,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Type feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingTypePropertyDescriptor(Object object) {
@@ -271,9 +272,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Equal feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Equal feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEqualPropertyDescriptor(Object object) {
@@ -287,9 +288,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndPropertyDescriptor(Object object) {
@@ -303,11 +304,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -322,22 +324,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorQuery.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorQuery.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -346,9 +348,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -359,10 +361,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -394,10 +396,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -441,7 +443,10 @@
 				AstFactory.eINSTANCE.createEnumLiteral()));
 
 		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
-				AstFactory.eINSTANCE.createTypeLiteral()));
+				AstFactory.eINSTANCE.createEClassifierTypeLiteral()));
+
+		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
+				AstFactory.eINSTANCE.createClassTypeLiteral()));
 
 		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
 				AstFactory.eINSTANCE.createTypeSetLiteral()));
@@ -517,9 +522,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorTemplateItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorTemplateItemProvider.java
index f979c21..ccd9f4f 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorTemplateItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorTemplateItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorTemplate;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -37,17 +33,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorTemplate} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorTemplate} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorTemplateItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorTemplateItemProvider(AdapterFactory adapterFactory) {
@@ -55,9 +52,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -84,9 +81,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Deprecated feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Deprecated feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDeprecatedPropertyDescriptor(Object object) {
@@ -100,9 +97,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
@@ -116,9 +113,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Main feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Main feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMainPropertyDescriptor(Object object) {
@@ -132,9 +129,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Visibility feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Visibility feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addVisibilityPropertyDescriptor(Object object) {
@@ -148,9 +145,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Visibility feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Visibility feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingVisibilityPropertyDescriptor(Object object) {
@@ -164,9 +161,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Name feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingNamePropertyDescriptor(Object object) {
@@ -181,8 +178,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Open Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingOpenParenthesisPropertyDescriptor(Object object) {
@@ -196,9 +193,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Parameters feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Parameters feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingParametersPropertyDescriptor(Object object) {
@@ -213,8 +210,8 @@
 
 	/**
 	 * This adds a property descriptor for the Missing Close Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingCloseParenthesisPropertyDescriptor(Object object) {
@@ -228,9 +225,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Guard Open Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Guard Open Parenthesis
+	 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingGuardOpenParenthesisPropertyDescriptor(Object object) {
@@ -244,9 +241,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Guard Close Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Guard Close Parenthesis
+	 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingGuardCloseParenthesisPropertyDescriptor(Object object) {
@@ -260,9 +257,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Post Close Parenthesis feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Post Close Parenthesis
+	 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingPostCloseParenthesisPropertyDescriptor(Object object) {
@@ -276,9 +273,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End Header feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End Header feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndHeaderPropertyDescriptor(Object object) {
@@ -292,9 +289,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing End feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing End feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingEndPropertyDescriptor(Object object) {
@@ -308,11 +305,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -329,22 +327,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorTemplate.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorTemplate.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -353,9 +351,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -366,10 +364,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -405,10 +403,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -456,9 +454,10 @@
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for
+	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -477,9 +476,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorVariableItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorVariableItemProvider.java
index ac684fa..d6d44eb 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorVariableItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ErrorVariableItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -33,17 +33,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ErrorVariable} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ErrorVariable} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ErrorVariableItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ErrorVariableItemProvider(AdapterFactory adapterFactory) {
@@ -51,9 +52,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -71,9 +72,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
@@ -87,9 +88,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
@@ -103,9 +104,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Name feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingNamePropertyDescriptor(Object object) {
@@ -119,9 +120,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Colon feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Colon feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingColonPropertyDescriptor(Object object) {
@@ -135,9 +136,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Missing Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Missing Type feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMissingTypePropertyDescriptor(Object object) {
@@ -151,11 +152,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -168,22 +170,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ErrorVariable.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ErrorVariable.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -192,9 +194,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -205,10 +207,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -230,10 +232,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -265,7 +267,10 @@
 				AstFactory.eINSTANCE.createEnumLiteral()));
 
 		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
-				AstFactory.eINSTANCE.createTypeLiteral()));
+				AstFactory.eINSTANCE.createEClassifierTypeLiteral()));
+
+		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
+				AstFactory.eINSTANCE.createClassTypeLiteral()));
 
 		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
 				AstFactory.eINSTANCE.createTypeSetLiteral()));
@@ -329,9 +334,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ExpressionItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ExpressionItemProvider.java
index fcb6252..9112bcc 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ExpressionItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ExpressionItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -34,17 +34,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.Expression} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.Expression} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class ExpressionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ExpressionItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +53,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,9 +69,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Ast feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Ast feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAstPropertyDescriptor(Object object) {
@@ -84,11 +85,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -101,22 +103,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns Expression.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns Expression.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -125,9 +127,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -139,10 +141,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -161,10 +163,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -196,7 +198,10 @@
 				AstFactory.eINSTANCE.createEnumLiteral()));
 
 		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.EXPRESSION__AQL,
-				AstFactory.eINSTANCE.createTypeLiteral()));
+				AstFactory.eINSTANCE.createEClassifierTypeLiteral()));
+
+		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.EXPRESSION__AQL,
+				AstFactory.eINSTANCE.createClassTypeLiteral()));
 
 		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.EXPRESSION__AQL,
 				AstFactory.eINSTANCE.createTypeSetLiteral()));
@@ -260,9 +265,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ExpressionStatementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ExpressionStatementItemProvider.java
index ba9dd51..7397cec 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ExpressionStatementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ExpressionStatementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,24 +16,23 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ExpressionStatement;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ExpressionStatement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ExpressionStatement} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ExpressionStatementItemProvider extends LeafStatementItemProvider {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ExpressionStatementItemProvider(AdapterFactory adapterFactory) {
@@ -41,9 +40,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -57,9 +56,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Expression feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Expression feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addExpressionPropertyDescriptor(Object object) {
@@ -72,9 +71,9 @@
 	}
 
 	/**
-	 * This returns ExpressionStatement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ExpressionStatement.gif. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -83,9 +82,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -95,10 +94,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -108,10 +107,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/FileStatementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/FileStatementItemProvider.java
index 0fd251e..7e64bd0 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/FileStatementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/FileStatementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -18,14 +18,10 @@
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.FileStatement;
 import org.eclipse.acceleo.OpenModeKind;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -38,17 +34,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.FileStatement} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.FileStatement} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class FileStatementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FileStatementItemProvider(AdapterFactory adapterFactory) {
@@ -56,9 +53,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -72,9 +69,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Mode feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Mode feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addModePropertyDescriptor(Object object) {
@@ -88,11 +85,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -107,22 +105,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns FileStatement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns FileStatement.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -131,9 +129,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -145,10 +143,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -169,10 +167,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -196,9 +194,10 @@
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for
+	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -217,9 +216,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ForStatementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ForStatementItemProvider.java
index 3680756..437e864 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ForStatementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ForStatementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ForStatement;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -35,17 +31,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ForStatement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ForStatement} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class ForStatementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ForStatementItemProvider(AdapterFactory adapterFactory) {
@@ -53,9 +50,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,11 +65,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,22 +85,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ForStatement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ForStatement.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -111,9 +109,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -122,10 +120,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -143,10 +141,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -170,9 +168,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/IfStatementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/IfStatementItemProvider.java
index e4f747e..6543b75 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/IfStatementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/IfStatementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.IfStatement;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -35,17 +31,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.IfStatement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.IfStatement} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class IfStatementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public IfStatementItemProvider(AdapterFactory adapterFactory) {
@@ -53,9 +50,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,11 +65,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,22 +85,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns IfStatement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns IfStatement.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -111,9 +109,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -122,10 +120,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -143,10 +141,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -167,9 +165,10 @@
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for
+	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -188,9 +187,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ImportItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ImportItemProvider.java
index 59b1e72..6256e3c 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ImportItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ImportItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.Import;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -35,17 +31,17 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.Import} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.acceleo.Import}
+ * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ImportItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ImportItemProvider(AdapterFactory adapterFactory) {
@@ -53,9 +49,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,11 +64,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -85,22 +82,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns Import.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns Import.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -109,9 +106,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -120,10 +117,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -139,10 +136,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -157,9 +154,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/LeafStatementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/LeafStatementItemProvider.java
index 46f79e3..8874ff8 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/LeafStatementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/LeafStatementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,12 +16,9 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.LeafStatement;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -34,17 +31,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.LeafStatement} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.LeafStatement} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class LeafStatementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public LeafStatementItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +50,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,9 +66,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the New Line Needed feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the New Line Needed feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNewLineNeededPropertyDescriptor(Object object) {
@@ -84,9 +82,8 @@
 	}
 
 	/**
-	 * This returns LeafStatement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns LeafStatement.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -95,9 +92,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -107,10 +104,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -126,10 +123,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -138,9 +135,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/LetStatementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/LetStatementItemProvider.java
index 83858af..c1db019 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/LetStatementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/LetStatementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.LetStatement;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -35,17 +31,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.LetStatement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.LetStatement} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class LetStatementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public LetStatementItemProvider(AdapterFactory adapterFactory) {
@@ -53,9 +50,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,11 +65,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -86,22 +84,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns LetStatement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns LetStatement.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -110,9 +108,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -121,10 +119,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -141,10 +139,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,9 +160,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/MetamodelItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/MetamodelItemProvider.java
index 9d1a29b..12f37e3 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/MetamodelItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/MetamodelItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -15,12 +15,9 @@
 import java.util.List;
 
 import org.eclipse.acceleo.AcceleoPackage;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -31,17 +28,17 @@
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.Metamodel} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.acceleo.Metamodel}
+ * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class MetamodelItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public MetamodelItemProvider(AdapterFactory adapterFactory) {
@@ -49,9 +46,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -65,9 +62,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Referenced Package feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Referenced Package feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addReferencedPackagePropertyDescriptor(Object object) {
@@ -80,9 +77,8 @@
 	}
 
 	/**
-	 * This returns Metamodel.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns Metamodel.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -91,9 +87,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -102,10 +98,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -115,10 +111,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,9 +123,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleDocumentationItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleDocumentationItemProvider.java
index 8c9f418..64a0abd 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleDocumentationItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleDocumentationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,26 +16,25 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ModuleDocumentation;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ModuleDocumentation} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ModuleDocumentation} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ModuleDocumentationItemProvider extends CommentItemProvider {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ModuleDocumentationItemProvider(AdapterFactory adapterFactory) {
@@ -43,9 +42,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -61,9 +60,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Author feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Author feature. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAuthorPropertyDescriptor(Object object) {
@@ -77,9 +76,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Version feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Version feature. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addVersionPropertyDescriptor(Object object) {
@@ -93,9 +92,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Since feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Since feature. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSincePropertyDescriptor(Object object) {
@@ -109,9 +108,9 @@
 	}
 
 	/**
-	 * This returns ModuleDocumentation.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ModuleDocumentation.gif. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -120,9 +119,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -133,10 +132,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -154,10 +153,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleElementDocumentationItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleElementDocumentationItemProvider.java
index 2a1053b..0da9102 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleElementDocumentationItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleElementDocumentationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,26 +17,24 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ModuleElementDocumentation;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ModuleElementDocumentation} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ModuleElementDocumentation} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ModuleElementDocumentationItemProvider extends CommentItemProvider {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ModuleElementDocumentationItemProvider(AdapterFactory adapterFactory) {
@@ -44,9 +42,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -59,11 +57,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,22 +75,23 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ModuleElementDocumentation.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ModuleElementDocumentation.gif. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -100,9 +100,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -111,10 +111,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -130,10 +130,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleElementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleElementItemProvider.java
index 54582ad..fd8c940 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleElementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleElementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,9 +16,7 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -28,17 +26,18 @@
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ModuleElement} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ModuleElement} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ModuleElementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ModuleElementItemProvider(AdapterFactory adapterFactory) {
@@ -46,9 +45,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -61,9 +60,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -72,10 +71,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -85,10 +84,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,9 +96,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleItemProvider.java
index d856960..9d49b0c 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,28 +16,25 @@
 
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.Module} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.acceleo.Module}
+ * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ModuleItemProvider extends NamedElementItemProvider {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ModuleItemProvider(AdapterFactory adapterFactory) {
@@ -45,9 +42,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,9 +64,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Deprecated feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Deprecated feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDeprecatedPropertyDescriptor(Object object) {
@@ -83,9 +80,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Metamodels feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Metamodels feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMetamodelsPropertyDescriptor(Object object) {
@@ -98,9 +95,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Extends feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Extends feature. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addExtendsPropertyDescriptor(Object object) {
@@ -113,9 +110,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Imports feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Imports feature. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addImportsPropertyDescriptor(Object object) {
@@ -128,9 +125,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Start Header Position feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Start Header Position feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addStartHeaderPositionPropertyDescriptor(Object object) {
@@ -144,9 +141,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the End Header Position feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the End Header Position feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addEndHeaderPositionPropertyDescriptor(Object object) {
@@ -160,9 +157,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Ast feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Ast feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAstPropertyDescriptor(Object object) {
@@ -175,11 +172,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -193,22 +191,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns Module.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns Module.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -217,9 +215,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -230,10 +228,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -258,10 +256,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -321,9 +319,10 @@
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for
+	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleReferenceItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleReferenceItemProvider.java
index 09e823e..20a4b3a 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleReferenceItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ModuleReferenceItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,12 +16,9 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ModuleReference;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -34,17 +31,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ModuleReference} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ModuleReference} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ModuleReferenceItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ModuleReferenceItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +50,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,9 +66,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Qualified Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Qualified Name feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addQualifiedNamePropertyDescriptor(Object object) {
@@ -84,9 +82,9 @@
 	}
 
 	/**
-	 * This returns ModuleReference.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ModuleReference.gif. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -95,9 +93,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -108,10 +106,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,10 +125,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -139,9 +137,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/NamedElementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/NamedElementItemProvider.java
index cec9390..8c6536d 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/NamedElementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/NamedElementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,12 +16,9 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.NamedElement;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -34,17 +31,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.NamedElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.NamedElement} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class NamedElementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NamedElementItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +50,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,9 +66,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
@@ -84,9 +82,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,10 +95,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -116,10 +114,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,9 +126,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/NewLineStatementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/NewLineStatementItemProvider.java
index 063bea4..c9d8cfb 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/NewLineStatementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/NewLineStatementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,7 +16,6 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.NewLineStatement;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
@@ -25,16 +24,17 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.NewLineStatement} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.NewLineStatement} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class NewLineStatementItemProvider extends TextStatementItemProvider {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NewLineStatementItemProvider(AdapterFactory adapterFactory) {
@@ -42,9 +42,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -58,9 +58,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Indentation Needed feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Indentation Needed feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIndentationNeededPropertyDescriptor(Object object) {
@@ -74,9 +74,9 @@
 	}
 
 	/**
-	 * This returns NewLineStatement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns NewLineStatement.gif. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -85,9 +85,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,10 +97,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -116,10 +116,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ParameterDocumentationItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ParameterDocumentationItemProvider.java
index 1a8e851..e4f53b1 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ParameterDocumentationItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ParameterDocumentationItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,20 +16,20 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ParameterDocumentation} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ParameterDocumentation} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ParameterDocumentationItemProvider extends CommentItemProvider {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ParameterDocumentationItemProvider(AdapterFactory adapterFactory) {
@@ -37,9 +37,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -52,9 +52,9 @@
 	}
 
 	/**
-	 * This returns ParameterDocumentation.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ParameterDocumentation.gif. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -63,9 +63,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,10 +74,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,10 +87,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ProtectedAreaItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ProtectedAreaItemProvider.java
index 02b11d6..1286323 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ProtectedAreaItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/ProtectedAreaItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,14 +17,10 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ProtectedArea;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -35,17 +31,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.ProtectedArea} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.ProtectedArea} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ProtectedAreaItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ProtectedAreaItemProvider(AdapterFactory adapterFactory) {
@@ -53,9 +50,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,11 +65,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -86,22 +84,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns ProtectedArea.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns ProtectedArea.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -110,9 +108,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -121,10 +119,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -141,10 +139,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,9 +160,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/QueryItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/QueryItemProvider.java
index 8d2cab8..a6b9b46 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/QueryItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/QueryItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -27,16 +27,16 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.Query} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.acceleo.Query}
+ * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class QueryItemProvider extends ModuleElementItemProvider {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public QueryItemProvider(AdapterFactory adapterFactory) {
@@ -44,9 +44,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -64,9 +64,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Deprecated feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Deprecated feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDeprecatedPropertyDescriptor(Object object) {
@@ -80,9 +80,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
@@ -96,9 +96,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
@@ -112,9 +112,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Visibility feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Visibility feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addVisibilityPropertyDescriptor(Object object) {
@@ -128,9 +128,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Body feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Body feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addBodyPropertyDescriptor(Object object) {
@@ -142,11 +142,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -161,22 +162,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns Query.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns Query.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -185,9 +186,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -198,10 +199,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -224,10 +225,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -271,7 +272,10 @@
 				AstFactory.eINSTANCE.createEnumLiteral()));
 
 		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
-				AstFactory.eINSTANCE.createTypeLiteral()));
+				AstFactory.eINSTANCE.createEClassifierTypeLiteral()));
+
+		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
+				AstFactory.eINSTANCE.createClassTypeLiteral()));
 
 		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
 				AstFactory.eINSTANCE.createTypeSetLiteral()));
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/TemplateItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/TemplateItemProvider.java
index 54de3ee..609f67b 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/TemplateItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/TemplateItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,28 +17,25 @@
 import org.eclipse.acceleo.AcceleoFactory;
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.Template;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.Template} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.acceleo.Template}
+ * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class TemplateItemProvider extends ModuleElementItemProvider {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TemplateItemProvider(AdapterFactory adapterFactory) {
@@ -46,9 +43,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -65,9 +62,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Deprecated feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Deprecated feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDeprecatedPropertyDescriptor(Object object) {
@@ -81,9 +78,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
@@ -97,9 +94,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Main feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Main feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addMainPropertyDescriptor(Object object) {
@@ -113,9 +110,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Visibility feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Visibility feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addVisibilityPropertyDescriptor(Object object) {
@@ -129,11 +126,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -150,22 +148,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns Template.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns Template.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -174,9 +172,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -187,10 +185,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -216,10 +214,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -267,9 +265,10 @@
 	}
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the label text for
+	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/TextStatementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/TextStatementItemProvider.java
index 2da9318..3726e14 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/TextStatementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/TextStatementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,26 +16,25 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.TextStatement;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.TextStatement} object.
- * <!-- begin-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.TextStatement} object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class TextStatementItemProvider extends LeafStatementItemProvider {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TextStatementItemProvider(AdapterFactory adapterFactory) {
@@ -43,9 +42,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -59,9 +58,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds a property descriptor for the Value feature. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addValuePropertyDescriptor(Object object) {
@@ -75,9 +74,8 @@
 	}
 
 	/**
-	 * This returns TextStatement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns TextStatement.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -86,9 +84,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -98,10 +96,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -117,10 +115,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/TypedElementItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/TypedElementItemProvider.java
index 736a1e3..235551a 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/TypedElementItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/TypedElementItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -34,17 +34,18 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.TypedElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a
+ * {@link org.eclipse.acceleo.TypedElement} object. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class TypedElementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
 		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TypedElementItemProvider(AdapterFactory adapterFactory) {
@@ -52,9 +53,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,9 +69,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
@@ -84,11 +85,12 @@
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an
+	 * appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -101,22 +103,22 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);
 	}
 
 	/**
-	 * This returns TypedElement.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns TypedElement.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -125,9 +127,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -139,10 +141,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -158,10 +160,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -193,7 +195,10 @@
 				AstFactory.eINSTANCE.createEnumLiteral()));
 
 		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
-				AstFactory.eINSTANCE.createTypeLiteral()));
+				AstFactory.eINSTANCE.createEClassifierTypeLiteral()));
+
+		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
+				AstFactory.eINSTANCE.createClassTypeLiteral()));
 
 		newChildDescriptors.add(createChildParameter(AcceleoPackage.Literals.TYPED_ELEMENT__TYPE_AQL,
 				AstFactory.eINSTANCE.createTypeSetLiteral()));
@@ -257,9 +262,9 @@
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/VariableItemProvider.java b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/VariableItemProvider.java
index 4c595ad..b91b79e 100644
--- a/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/VariableItemProvider.java
+++ b/plugins/org.eclipse.acceleo.aql.edit/src-gen/org/eclipse/acceleo/provider/VariableItemProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,26 +16,24 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.Variable;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.acceleo.Variable} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.acceleo.Variable}
+ * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class VariableItemProvider extends TypedElementItemProvider {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VariableItemProvider(AdapterFactory adapterFactory) {
@@ -43,9 +41,9 @@
 	}
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -59,9 +57,9 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
+	 * This adds a property descriptor for the Name feature. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
@@ -75,9 +73,8 @@
 	}
 
 	/**
-	 * This returns Variable.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This returns Variable.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -86,9 +83,9 @@
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+	 * This returns the label text for the adapted class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,10 +96,10 @@
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This handles model notifications by calling {@link #updateChildren} to update
+	 * any cached children and by creating a viewer notification, which it passes to
+	 * {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -118,10 +115,10 @@
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing
+	 * the children that can be created under this object. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql.ide.ui/src/org/eclipse/acceleo/aql/ide/ui/EclipseWorkspace2AcceleoWorkspace.java b/plugins/org.eclipse.acceleo.aql.ide.ui/src/org/eclipse/acceleo/aql/ide/ui/EclipseWorkspace2AcceleoWorkspace.java
index 4678fb4..1166b2f 100644
--- a/plugins/org.eclipse.acceleo.aql.ide.ui/src/org/eclipse/acceleo/aql/ide/ui/EclipseWorkspace2AcceleoWorkspace.java
+++ b/plugins/org.eclipse.acceleo.aql.ide.ui/src/org/eclipse/acceleo/aql/ide/ui/EclipseWorkspace2AcceleoWorkspace.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017 Obeo.
+ * Copyright (c) 2017, 2021 Obeo.
  * 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
@@ -556,7 +556,7 @@
 
 			final AcceleoEvaluator evaluator = new AcceleoEvaluator(acceleoEnvironment, queryEnvironment
 					.getLookupEngine());
-			resolver.addLoader(new ModuleLoader(new AcceleoParser(queryEnvironment), evaluator));
+			resolver.addLoader(new ModuleLoader(new AcceleoParser(), evaluator));
 			resolver.addLoader(new JavaLoader(AcceleoParser.QUALIFIER_SEPARATOR));
 
 			return acceleoEnvironment;
diff --git a/plugins/org.eclipse.acceleo.aql.ide/src/org/eclipse/acceleo/aql/ide/AcceleoPlugin.java b/plugins/org.eclipse.acceleo.aql.ide/src/org/eclipse/acceleo/aql/ide/AcceleoPlugin.java
index 6c83b19..5f52f44 100644
--- a/plugins/org.eclipse.acceleo.aql.ide/src/org/eclipse/acceleo/aql/ide/AcceleoPlugin.java
+++ b/plugins/org.eclipse.acceleo.aql.ide/src/org/eclipse/acceleo/aql/ide/AcceleoPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2017 Obeo. 
+ *  Copyright (c) 2017, 2021 Obeo. 
  *  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
@@ -20,7 +20,6 @@
 import org.eclipse.acceleo.ModuleElement;
 import org.eclipse.acceleo.Template;
 import org.eclipse.acceleo.aql.parser.AcceleoParser;
-import org.eclipse.acceleo.query.runtime.Query;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
@@ -145,7 +144,7 @@
 	public static boolean isAcceleoMain(IResource resource) {
 		boolean res = false;
 
-		final AcceleoParser parser = new AcceleoParser(Query.newEnvironment());
+		final AcceleoParser parser = new AcceleoParser();
 		final IFile file = (IFile)resource;
 		try (InputStream contents = file.getContents()) {
 			final Module module = parser.parse(contents, Charset.forName(file.getCharset()), "none")
@@ -157,11 +156,11 @@
 				}
 			}
 		} catch (IOException e) {
-			AcceleoPlugin.getPlugin().log(new Status(IStatus.ERROR, AcceleoPlugin.PLUGIN_ID, "couldn't parse module "
-					+ resource.getFullPath(), e));
+			AcceleoPlugin.getPlugin().log(new Status(IStatus.ERROR, AcceleoPlugin.PLUGIN_ID,
+					"couldn't parse module " + resource.getFullPath(), e));
 		} catch (CoreException e) {
-			AcceleoPlugin.getPlugin().log(new Status(IStatus.ERROR, AcceleoPlugin.PLUGIN_ID, "couldn't parse module "
-					+ resource.getFullPath(), e));
+			AcceleoPlugin.getPlugin().log(new Status(IStatus.ERROR, AcceleoPlugin.PLUGIN_ID,
+					"couldn't parse module " + resource.getFullPath(), e));
 		}
 
 		return res;
diff --git a/plugins/org.eclipse.acceleo.aql.launcher/src/org/eclipse/acceleo/aql/launcher/AcceleoLauncher.java b/plugins/org.eclipse.acceleo.aql.launcher/src/org/eclipse/acceleo/aql/launcher/AcceleoLauncher.java
index 142e719..660b335 100644
--- a/plugins/org.eclipse.acceleo.aql.launcher/src/org/eclipse/acceleo/aql/launcher/AcceleoLauncher.java
+++ b/plugins/org.eclipse.acceleo.aql.launcher/src/org/eclipse/acceleo/aql/launcher/AcceleoLauncher.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2020 Obeo.

+ * Copyright (c) 2020, 2021 Obeo.

  * 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

@@ -224,7 +224,7 @@
 		AcceleoEvaluator evaluator = new AcceleoEvaluator(acceleoEnvironment, queryEnvironment

 				.getLookupEngine());

 

-		resolver.addLoader(new ModuleLoader(new AcceleoParser(queryEnvironment), evaluator));

+		resolver.addLoader(new ModuleLoader(new AcceleoParser(), evaluator));

 		resolver.addLoader(new JavaLoader(AcceleoParser.QUALIFIER_SEPARATOR));

 

 		final Object resolved = resolver.resolve(moduleQualifiedName);

diff --git a/plugins/org.eclipse.acceleo.aql.ls.debug/src/org/eclipse/acceleo/aql/ls/debug/AcceleoDebugger.java b/plugins/org.eclipse.acceleo.aql.ls.debug/src/org/eclipse/acceleo/aql/ls/debug/AcceleoDebugger.java
index 467fad2..b25dcd0 100644
--- a/plugins/org.eclipse.acceleo.aql.ls.debug/src/org/eclipse/acceleo/aql/ls/debug/AcceleoDebugger.java
+++ b/plugins/org.eclipse.acceleo.aql.ls.debug/src/org/eclipse/acceleo/aql/ls/debug/AcceleoDebugger.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Obeo.
+ * Copyright (c) 2020, 2021 Obeo.
  * 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
@@ -88,8 +88,7 @@
 					final IQualifiedNameResolver resolver = environment.getQueryEnvironment()
 							.getLookupEngine().getResolver();
 					resolver.clearLoaders();
-					resolver.addLoader(new ModuleLoader(new AcceleoParser(environment.getQueryEnvironment()),
-							evaluator));
+					resolver.addLoader(new ModuleLoader(new AcceleoParser(), evaluator));
 					resolver.addLoader(new JavaLoader(AcceleoParser.QUALIFIER_SEPARATOR));
 
 					AcceleoUtil.generate(evaluator, environment, module, model);
@@ -240,7 +239,7 @@
 		for (String nsURI : new ArrayList<String>(EPackage.Registry.INSTANCE.keySet())) {
 			registerEPackage(queryEnvironment, EPackage.Registry.INSTANCE.getEPackage(nsURI));
 		}
-		resolver.addLoader(new ModuleLoader(new AcceleoParser(environment.getQueryEnvironment()), evaluator));
+		resolver.addLoader(new ModuleLoader(new AcceleoParser(), evaluator));
 		resolver.addLoader(new JavaLoader(AcceleoParser.QUALIFIER_SEPARATOR));
 
 		try {
@@ -324,8 +323,7 @@
 		final IQualifiedNameResolver resolver = environment.getQueryEnvironment().getLookupEngine()
 				.getResolver();
 		resolver.clearLoaders();
-		resolver.addLoader(new ModuleLoader(new AcceleoParser(environment.getQueryEnvironment()),
-				noDebugEvaluator));
+		resolver.addLoader(new ModuleLoader(new AcceleoParser(), noDebugEvaluator));
 		resolver.addLoader(new JavaLoader(AcceleoParser.QUALIFIER_SEPARATOR));
 
 		AcceleoUtil.generate(noDebugEvaluator, env, module, modelResource);
diff --git a/plugins/org.eclipse.acceleo.aql.ls/src/org/eclipse/acceleo/aql/ls/services/textdocument/AcceleoTextDocument.java b/plugins/org.eclipse.acceleo.aql.ls/src/org/eclipse/acceleo/aql/ls/services/textdocument/AcceleoTextDocument.java
index f380a49..8efb191 100644
--- a/plugins/org.eclipse.acceleo.aql.ls/src/org/eclipse/acceleo/aql/ls/services/textdocument/AcceleoTextDocument.java
+++ b/plugins/org.eclipse.acceleo.aql.ls/src/org/eclipse/acceleo/aql/ls/services/textdocument/AcceleoTextDocument.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Obeo.
+ * Copyright (c) 2020, 2021 Obeo.
  * 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
@@ -190,7 +190,7 @@
 		Objects.requireNonNull(documentContents);
 		Objects.requireNonNull(acceleoEnvironment);
 
-		AcceleoParser acceleoParser = new AcceleoParser(acceleoEnvironment.getQueryEnvironment());
+		AcceleoParser acceleoParser = new AcceleoParser();
 		return acceleoParser.parse(documentContents, moduleQualifiedName);
 	}
 
diff --git a/plugins/org.eclipse.acceleo.aql.migration/src/org/eclipse/acceleo/aql/migration/converters/ExpressionConverter.java b/plugins/org.eclipse.acceleo.aql.migration/src/org/eclipse/acceleo/aql/migration/converters/ExpressionConverter.java
index 3072019..dff36e0 100644
--- a/plugins/org.eclipse.acceleo.aql.migration/src/org/eclipse/acceleo/aql/migration/converters/ExpressionConverter.java
+++ b/plugins/org.eclipse.acceleo.aql.migration/src/org/eclipse/acceleo/aql/migration/converters/ExpressionConverter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2017 Obeo.

+ * Copyright (c) 2017, 2021 Obeo.

  * 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

@@ -223,7 +223,12 @@
 				break;

 			case EcorePackage.ENUM_LITERAL_EXP:

 				output = AstFactory.eINSTANCE.createEnumLiteral();

-				((EnumLiteral)output).setLiteral(((EnumLiteralExp)input).getReferredEnumLiteral());

+				((EnumLiteral)output).setEPackageName(((EnumLiteralExp)input).getReferredEnumLiteral()

+						.getEEnum().getEPackage().getName());

+				((EnumLiteral)output).setEEnumName(((EnumLiteralExp)input).getReferredEnumLiteral().getEEnum()

+						.getName());

+				((EnumLiteral)output).setEEnumLiteralName(((EnumLiteralExp)input).getReferredEnumLiteral()

+						.getName());

 				break;

 			case EcorePackage.NULL_LITERAL_EXP:

 				output = AstFactory.eINSTANCE.createNullLiteral();

diff --git a/plugins/org.eclipse.acceleo.aql.migration/src/org/eclipse/acceleo/aql/migration/converters/utils/TypeUtils.java b/plugins/org.eclipse.acceleo.aql.migration/src/org/eclipse/acceleo/aql/migration/converters/utils/TypeUtils.java
index ac7df56..f7dcebc 100644
--- a/plugins/org.eclipse.acceleo.aql.migration/src/org/eclipse/acceleo/aql/migration/converters/utils/TypeUtils.java
+++ b/plugins/org.eclipse.acceleo.aql.migration/src/org/eclipse/acceleo/aql/migration/converters/utils/TypeUtils.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017 Obeo.
+ * Copyright (c) 2017, 2021 Obeo.
  * 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
@@ -16,7 +16,9 @@
 import java.util.Set;
 
 import org.eclipse.acceleo.query.ast.AstFactory;
+import org.eclipse.acceleo.query.ast.ClassTypeLiteral;
 import org.eclipse.acceleo.query.ast.CollectionTypeLiteral;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
 import org.eclipse.acceleo.query.ast.TypeLiteral;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EcorePackage;
@@ -81,14 +83,17 @@
 			((CollectionTypeLiteral)typeLiteral).setElementType(createTypeLiteral(((CollectionType)inputType)
 					.getElementType()));
 		} else if (inputType instanceof PrimitiveType) {
-			typeLiteral = AstFactory.eINSTANCE.createTypeLiteral();
-			typeLiteral.setValue(inputType.getInstanceClass());
+			typeLiteral = AstFactory.eINSTANCE.createClassTypeLiteral();
+			((ClassTypeLiteral)typeLiteral).setValue(inputType.getInstanceClass());
 		} else if (inputType instanceof AnyType) {
-			typeLiteral = AstFactory.eINSTANCE.createTypeLiteral();
-			typeLiteral.setValue(EcorePackage.eINSTANCE.getEObject());
+			typeLiteral = AstFactory.eINSTANCE.createEClassifierTypeLiteral();
+			((EClassifierTypeLiteral)typeLiteral).setEPackageName(EcorePackage.eNAME);
+			((EClassifierTypeLiteral)typeLiteral).setEClassifierName(EcorePackage.eINSTANCE.getEObject()
+					.getName());
 		} else {
-			typeLiteral = AstFactory.eINSTANCE.createTypeLiteral();
-			typeLiteral.setValue(inputType);
+			typeLiteral = AstFactory.eINSTANCE.createEClassifierTypeLiteral();
+			((EClassifierTypeLiteral)typeLiteral).setEPackageName(inputType.getEPackage().getName());
+			((EClassifierTypeLiteral)typeLiteral).setEClassifierName(inputType.getName());
 		}
 		return typeLiteral;
 	}
diff --git a/plugins/org.eclipse.acceleo.aql/model/acceleo.genmodel b/plugins/org.eclipse.acceleo.aql/model/acceleo.genmodel
index 4a26de9..a237e6a 100644
--- a/plugins/org.eclipse.acceleo.aql/model/acceleo.genmodel
+++ b/plugins/org.eclipse.acceleo.aql/model/acceleo.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2008, 2020 Obeo.&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;     Obeo - initial API and implementation"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2008, 2021 Obeo.&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;     Obeo - initial API and implementation"

     modelDirectory="/org.eclipse.acceleo.aql/src-gen" editDirectory="/org.eclipse.acceleo.aql.edit/src-gen"

     editorDirectory="/org.eclipse.acceleo.aql.editor/src-gen" modelPluginID="org.eclipse.acceleo.aql"

     modelName="Acceleo" editPluginClass="org.eclipse.acceleo.provider.AcceleoEditPlugin"

@@ -242,7 +242,7 @@
       <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/acceleo/query/1.0#//CallType/CALLORAPPLY"/>

       <genEnumLiterals ecoreEnumLiteral="http://www.eclipse.org/acceleo/query/1.0#//CallType/COLLECTIONCALL"/>

     </genEnums>

-    <genDataTypes ecoreDataType="http://www.eclipse.org/acceleo/query/1.0#//ObjectType"/>

+    <genDataTypes ecoreDataType="http://www.eclipse.org/acceleo/query/1.0#//JavaClass"/>

     <genClasses image="false" ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//Expression"/>

     <genClasses ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//VarRef">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/acceleo/query/1.0#//VarRef/variableName"/>

@@ -266,10 +266,17 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/acceleo/query/1.0#//BooleanLiteral/value"/>

     </genClasses>

     <genClasses ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//EnumLiteral">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference http://www.eclipse.org/acceleo/query/1.0#//EnumLiteral/literal"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/acceleo/query/1.0#//EnumLiteral/ePackageName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/acceleo/query/1.0#//EnumLiteral/eEnumName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/acceleo/query/1.0#//EnumLiteral/eEnumLiteralName"/>

     </genClasses>

-    <genClasses ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//TypeLiteral">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/acceleo/query/1.0#//TypeLiteral/value"/>

+    <genClasses ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//TypeLiteral"/>

+    <genClasses ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//EClassifierTypeLiteral">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/acceleo/query/1.0#//EClassifierTypeLiteral/ePackageName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/acceleo/query/1.0#//EClassifierTypeLiteral/eClassifierName"/>

+    </genClasses>

+    <genClasses ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//ClassTypeLiteral">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/acceleo/query/1.0#//ClassTypeLiteral/value"/>

     </genClasses>

     <genClasses ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//TypeSetLiteral">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference http://www.eclipse.org/acceleo/query/1.0#//TypeSetLiteral/types"/>

@@ -295,13 +302,11 @@
     </genClasses>

     <genClasses image="false" ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//Error"/>

     <genClasses ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//ErrorExpression"/>

-    <genClasses ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//ErrorTypeLiteral">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/acceleo/query/1.0#//ErrorTypeLiteral/segments"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/acceleo/query/1.0#//ErrorTypeLiteral/missingColon"/>

+    <genClasses ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//ErrorTypeLiteral"/>

+    <genClasses ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//ErrorEClassifierTypeLiteral">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/acceleo/query/1.0#//ErrorEClassifierTypeLiteral/missingColon"/>

     </genClasses>

-    <genClasses ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//ErrorEClassifierTypeLiteral"/>

     <genClasses ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//ErrorEnumLiteral">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/acceleo/query/1.0#//ErrorEnumLiteral/segments"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute http://www.eclipse.org/acceleo/query/1.0#//ErrorEnumLiteral/missingColon"/>

     </genClasses>

     <genClasses ecoreClass="http://www.eclipse.org/acceleo/query/1.0#//ErrorCall">

diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ASTNode.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ASTNode.java
index 936de62..b1d3d1d 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ASTNode.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ASTNode.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,10 +14,8 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>AST Node</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>AST Node</b></em>'. <!-- end-user-doc
+ * -->
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getASTNode()
  * @model interface="true" abstract="true"
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/AcceleoFactory.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/AcceleoFactory.java
index ffc4855..650d2ac 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/AcceleoFactory.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/AcceleoFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,434 +14,403 @@
 import org.eclipse.emf.ecore.EFactory;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract
+ * class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.acceleo.AcceleoPackage
  * @generated
  */
 public interface AcceleoFactory extends EFactory {
 	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	AcceleoFactory eINSTANCE = org.eclipse.acceleo.impl.AcceleoFactoryImpl.init();
 
 	/**
-	 * Returns a new object of class '<em>Module</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Module</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Module</em>'.
 	 * @generated
 	 */
 	Module createModule();
 
 	/**
-	 * Returns a new object of class '<em>Error Module</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Module</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Module</em>'.
 	 * @generated
 	 */
 	ErrorModule createErrorModule();
 
 	/**
-	 * Returns a new object of class '<em>Metamodel</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Metamodel</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Metamodel</em>'.
 	 * @generated
 	 */
 	Metamodel createMetamodel();
 
 	/**
-	 * Returns a new object of class '<em>Error Metamodel</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Metamodel</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Metamodel</em>'.
 	 * @generated
 	 */
 	ErrorMetamodel createErrorMetamodel();
 
 	/**
-	 * Returns a new object of class '<em>Import</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Import</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Import</em>'.
 	 * @generated
 	 */
 	Import createImport();
 
 	/**
-	 * Returns a new object of class '<em>Error Import</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Import</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Import</em>'.
 	 * @generated
 	 */
 	ErrorImport createErrorImport();
 
 	/**
-	 * Returns a new object of class '<em>Module Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Module Reference</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Module Reference</em>'.
 	 * @generated
 	 */
 	ModuleReference createModuleReference();
 
 	/**
-	 * Returns a new object of class '<em>Error Module Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Module Reference</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Module Reference</em>'.
 	 * @generated
 	 */
 	ErrorModuleReference createErrorModuleReference();
 
 	/**
-	 * Returns a new object of class '<em>Comment</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Comment</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Comment</em>'.
 	 * @generated
 	 */
 	Comment createComment();
 
 	/**
-	 * Returns a new object of class '<em>Block Comment</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Block Comment</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Block Comment</em>'.
 	 * @generated
 	 */
 	BlockComment createBlockComment();
 
 	/**
-	 * Returns a new object of class '<em>Error Block Comment</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Block Comment</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Error Block Comment</em>'.
 	 * @generated
 	 */
 	ErrorBlockComment createErrorBlockComment();
 
 	/**
-	 * Returns a new object of class '<em>Error Comment</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Comment</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Comment</em>'.
 	 * @generated
 	 */
 	ErrorComment createErrorComment();
 
 	/**
-	 * Returns a new object of class '<em>Comment Body</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Comment Body</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Comment Body</em>'.
 	 * @generated
 	 */
 	CommentBody createCommentBody();
 
 	/**
-	 * Returns a new object of class '<em>Module Documentation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Module Documentation</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Module Documentation</em>'.
 	 * @generated
 	 */
 	ModuleDocumentation createModuleDocumentation();
 
 	/**
-	 * Returns a new object of class '<em>Error Module Documentation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Module Documentation</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Module Documentation</em>'.
 	 * @generated
 	 */
 	ErrorModuleDocumentation createErrorModuleDocumentation();
 
 	/**
-	 * Returns a new object of class '<em>Module Element Documentation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Module Element Documentation</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Module Element Documentation</em>'.
 	 * @generated
 	 */
 	ModuleElementDocumentation createModuleElementDocumentation();
 
 	/**
-	 * Returns a new object of class '<em>Error Module Element Documentation</em>'.
-	 * <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Error Module Element Documentation</em>'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Module Element Documentation</em>'.
 	 * @generated
 	 */
 	ErrorModuleElementDocumentation createErrorModuleElementDocumentation();
 
 	/**
-	 * Returns a new object of class '<em>Parameter Documentation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Parameter Documentation</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Parameter Documentation</em>'.
 	 * @generated
 	 */
 	ParameterDocumentation createParameterDocumentation();
 
 	/**
-	 * Returns a new object of class '<em>Block</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Block</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Block</em>'.
 	 * @generated
 	 */
 	Block createBlock();
 
 	/**
-	 * Returns a new object of class '<em>Typed Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Typed Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Typed Element</em>'.
 	 * @generated
 	 */
 	TypedElement createTypedElement();
 
 	/**
-	 * Returns a new object of class '<em>Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Template</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Template</em>'.
 	 * @generated
 	 */
 	Template createTemplate();
 
 	/**
-	 * Returns a new object of class '<em>Error Template</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Template</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Template</em>'.
 	 * @generated
 	 */
 	ErrorTemplate createErrorTemplate();
 
 	/**
-	 * Returns a new object of class '<em>Query</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Query</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Query</em>'.
 	 * @generated
 	 */
 	Query createQuery();
 
 	/**
-	 * Returns a new object of class '<em>Error Query</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Query</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Query</em>'.
 	 * @generated
 	 */
 	ErrorQuery createErrorQuery();
 
 	/**
-	 * Returns a new object of class '<em>Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Expression</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Expression</em>'.
 	 * @generated
 	 */
 	Expression createExpression();
 
 	/**
-	 * Returns a new object of class '<em>Error Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Expression</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Error Expression</em>'.
 	 * @generated
 	 */
 	ErrorExpression createErrorExpression();
 
 	/**
-	 * Returns a new object of class '<em>Variable</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Variable</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Variable</em>'.
 	 * @generated
 	 */
 	Variable createVariable();
 
 	/**
-	 * Returns a new object of class '<em>Error Variable</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Variable</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Variable</em>'.
 	 * @generated
 	 */
 	ErrorVariable createErrorVariable();
 
 	/**
-	 * Returns a new object of class '<em>Binding</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Binding</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Binding</em>'.
 	 * @generated
 	 */
 	Binding createBinding();
 
 	/**
-	 * Returns a new object of class '<em>Error Binding</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Binding</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Binding</em>'.
 	 * @generated
 	 */
 	ErrorBinding createErrorBinding();
 
 	/**
-	 * Returns a new object of class '<em>Leaf Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Leaf Statement</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Leaf Statement</em>'.
 	 * @generated
 	 */
 	LeafStatement createLeafStatement();
 
 	/**
-	 * Returns a new object of class '<em>Expression Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Expression Statement</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Expression Statement</em>'.
 	 * @generated
 	 */
 	ExpressionStatement createExpressionStatement();
 
 	/**
-	 * Returns a new object of class '<em>Error Expression Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Expression Statement</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Expression Statement</em>'.
 	 * @generated
 	 */
 	ErrorExpressionStatement createErrorExpressionStatement();
 
 	/**
-	 * Returns a new object of class '<em>Protected Area</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Protected Area</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Protected Area</em>'.
 	 * @generated
 	 */
 	ProtectedArea createProtectedArea();
 
 	/**
-	 * Returns a new object of class '<em>Error Protected Area</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Protected Area</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error Protected Area</em>'.
 	 * @generated
 	 */
 	ErrorProtectedArea createErrorProtectedArea();
 
 	/**
-	 * Returns a new object of class '<em>For Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>For Statement</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>For Statement</em>'.
 	 * @generated
 	 */
 	ForStatement createForStatement();
 
 	/**
-	 * Returns a new object of class '<em>Error For Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error For Statement</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Error For Statement</em>'.
 	 * @generated
 	 */
 	ErrorForStatement createErrorForStatement();
 
 	/**
-	 * Returns a new object of class '<em>If Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>If Statement</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>If Statement</em>'.
 	 * @generated
 	 */
 	IfStatement createIfStatement();
 
 	/**
-	 * Returns a new object of class '<em>Error If Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error If Statement</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Error If Statement</em>'.
 	 * @generated
 	 */
 	ErrorIfStatement createErrorIfStatement();
 
 	/**
-	 * Returns a new object of class '<em>Let Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Let Statement</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Let Statement</em>'.
 	 * @generated
 	 */
 	LetStatement createLetStatement();
 
 	/**
-	 * Returns a new object of class '<em>Error Let Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error Let Statement</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>Error Let Statement</em>'.
 	 * @generated
 	 */
 	ErrorLetStatement createErrorLetStatement();
 
 	/**
-	 * Returns a new object of class '<em>File Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>File Statement</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>File Statement</em>'.
 	 * @generated
 	 */
 	FileStatement createFileStatement();
 
 	/**
-	 * Returns a new object of class '<em>Error File Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Error File Statement</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Error File Statement</em>'.
 	 * @generated
 	 */
 	ErrorFileStatement createErrorFileStatement();
 
 	/**
-	 * Returns a new object of class '<em>Text Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>Text Statement</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Text Statement</em>'.
 	 * @generated
 	 */
 	TextStatement createTextStatement();
 
 	/**
-	 * Returns a new object of class '<em>New Line Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns a new object of class '<em>New Line Statement</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return a new object of class '<em>New Line Statement</em>'.
 	 * @generated
 	 */
 	NewLineStatement createNewLineStatement();
 
 	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
 	AcceleoPackage getAcceleoPackage();
 
-} //AcceleoFactory
+} // AcceleoFactory
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/AcceleoPackage.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/AcceleoPackage.java
index 24e5e17..cb823e3 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/AcceleoPackage.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/AcceleoPackage.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -19,58 +19,54 @@
 import org.eclipse.emf.ecore.EReference;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
+ * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to
+ * represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.acceleo.AcceleoFactory
  * @model kind="package"
  * @generated
  */
 public interface AcceleoPackage extends EPackage {
 	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "acceleo"; //$NON-NLS-1$
 
 	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.eclipse.org/acceleo/4.0"; //$NON-NLS-1$
 
 	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "acceleo"; //$NON-NLS-1$
 
 	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	AcceleoPackage eINSTANCE = org.eclipse.acceleo.impl.AcceleoPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.NamedElementImpl <em>Named Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.NamedElementImpl <em>Named Element</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.NamedElementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getNamedElement()
 	 * @generated
@@ -78,36 +74,35 @@
 	int NAMED_ELEMENT = 21;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NAMED_ELEMENT__NAME = 0;
 
 	/**
-	 * The number of structural features of the '<em>Named Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Named Element</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NAMED_ELEMENT_FEATURE_COUNT = 1;
 
 	/**
-	 * The number of operations of the '<em>Named Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Named Element</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NAMED_ELEMENT_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ModuleImpl <em>Module</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ModuleImpl <em>Module</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ModuleImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getModule()
 	 * @generated
@@ -115,117 +110,114 @@
 	int MODULE = 0;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE__NAME = NAMED_ELEMENT__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Documentation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE__DOCUMENTATION = NAMED_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Deprecated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Deprecated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE__DEPRECATED = NAMED_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Metamodels</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Metamodels</b></em>' reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE__METAMODELS = NAMED_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Extends</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Extends</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE__EXTENDS = NAMED_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Imports</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Imports</b></em>' containment reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE__IMPORTS = NAMED_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Module Elements</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Module Elements</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE__MODULE_ELEMENTS = NAMED_ELEMENT_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Start Header Position</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Start Header Position</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE__START_HEADER_POSITION = NAMED_ELEMENT_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>End Header Position</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>End Header Position</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE__END_HEADER_POSITION = NAMED_ELEMENT_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Ast</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ast</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE__AST = NAMED_ELEMENT_FEATURE_COUNT + 8;
 
 	/**
-	 * The number of structural features of the '<em>Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Module</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 9;
 
 	/**
-	 * The number of operations of the '<em>Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Module</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_OPERATION_COUNT = NAMED_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.Error <em>Error</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.Error <em>Error</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.Error
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getError()
 	 * @generated
@@ -233,9 +225,9 @@
 	int ERROR = 23;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorModuleImpl <em>Error Module</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorModuleImpl <em>Error Module</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorModuleImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorModule()
 	 * @generated
@@ -243,9 +235,9 @@
 	int ERROR_MODULE = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.ASTNode <em>AST Node</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.ASTNode <em>AST Node</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.ASTNode
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getASTNode()
 	 * @generated
@@ -253,180 +245,177 @@
 	int AST_NODE = 22;
 
 	/**
-	 * The number of structural features of the '<em>AST Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>AST Node</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int AST_NODE_FEATURE_COUNT = 0;
 
 	/**
-	 * The number of operations of the '<em>AST Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>AST Node</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int AST_NODE_OPERATION_COUNT = 0;
 
 	/**
-	 * The number of structural features of the '<em>Error</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Error</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FEATURE_COUNT = AST_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of operations of the '<em>Error</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_OPERATION_COUNT = AST_NODE_OPERATION_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE__NAME = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Documentation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE__DOCUMENTATION = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Deprecated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Deprecated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE__DEPRECATED = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Metamodels</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Metamodels</b></em>' reference list. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE__METAMODELS = ERROR_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Extends</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Extends</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE__EXTENDS = ERROR_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Imports</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Imports</b></em>' containment reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE__IMPORTS = ERROR_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Module Elements</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Module Elements</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE__MODULE_ELEMENTS = ERROR_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Start Header Position</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Start Header Position</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE__START_HEADER_POSITION = ERROR_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>End Header Position</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>End Header Position</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE__END_HEADER_POSITION = ERROR_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>Ast</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ast</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE__AST = ERROR_FEATURE_COUNT + 9;
 
 	/**
-	 * The feature id for the '<em><b>Missing Open Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Open Parenthesis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE__MISSING_OPEN_PARENTHESIS = ERROR_FEATURE_COUNT + 10;
 
 	/**
-	 * The feature id for the '<em><b>Missing EPackage</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing EPackage</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE__MISSING_EPACKAGE = ERROR_FEATURE_COUNT + 11;
 
 	/**
-	 * The feature id for the '<em><b>Missing Close Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Close Parenthesis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE__MISSING_CLOSE_PARENTHESIS = ERROR_FEATURE_COUNT + 12;
 
 	/**
-	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE__MISSING_END_HEADER = ERROR_FEATURE_COUNT + 13;
 
 	/**
-	 * The number of structural features of the '<em>Error Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Error Module</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_FEATURE_COUNT = ERROR_FEATURE_COUNT + 14;
 
 	/**
-	 * The number of operations of the '<em>Error Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error Module</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -434,8 +423,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.acceleo.impl.MetamodelImpl <em>Metamodel</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.MetamodelImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getMetamodel()
 	 * @generated
@@ -443,36 +432,36 @@
 	int METAMODEL = 2;
 
 	/**
-	 * The feature id for the '<em><b>Referenced Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Referenced Package</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int METAMODEL__REFERENCED_PACKAGE = AST_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Metamodel</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Metamodel</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int METAMODEL_FEATURE_COUNT = AST_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Metamodel</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Metamodel</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int METAMODEL_OPERATION_COUNT = AST_NODE_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorMetamodelImpl <em>Error Metamodel</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorMetamodelImpl <em>Error
+	 * Metamodel</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorMetamodelImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorMetamodel()
 	 * @generated
@@ -480,54 +469,54 @@
 	int ERROR_METAMODEL = 3;
 
 	/**
-	 * The feature id for the '<em><b>Referenced Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Referenced Package</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_METAMODEL__REFERENCED_PACKAGE = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Fragment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Fragment</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_METAMODEL__FRAGMENT = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Missing End Quote</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End Quote</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_METAMODEL__MISSING_END_QUOTE = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Error Metamodel</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Error Metamodel</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_METAMODEL_FEATURE_COUNT = ERROR_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of operations of the '<em>Error Metamodel</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error Metamodel</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_METAMODEL_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ModuleReferenceImpl <em>Module Reference</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ModuleReferenceImpl <em>Module
+	 * Reference</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ModuleReferenceImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getModuleReference()
 	 * @generated
@@ -535,9 +524,9 @@
 	int MODULE_REFERENCE = 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ImportImpl <em>Import</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ImportImpl <em>Import</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ImportImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getImport()
 	 * @generated
@@ -545,36 +534,35 @@
 	int IMPORT = 4;
 
 	/**
-	 * The feature id for the '<em><b>Module</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Module</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IMPORT__MODULE = AST_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Import</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Import</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IMPORT_FEATURE_COUNT = AST_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Import</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Import</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IMPORT_OPERATION_COUNT = AST_NODE_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorImportImpl <em>Error Import</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorImportImpl <em>Error Import</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorImportImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorImport()
 	 * @generated
@@ -582,72 +570,72 @@
 	int ERROR_IMPORT = 5;
 
 	/**
-	 * The feature id for the '<em><b>Module</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Module</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_IMPORT__MODULE = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Missing End</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_IMPORT__MISSING_END = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Error Import</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Error Import</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_IMPORT_FEATURE_COUNT = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of operations of the '<em>Error Import</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error Import</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_IMPORT_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_REFERENCE__QUALIFIED_NAME = AST_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Module Reference</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Module Reference</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_REFERENCE_FEATURE_COUNT = AST_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Module Reference</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Module Reference</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_REFERENCE_OPERATION_COUNT = AST_NODE_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorModuleReferenceImpl <em>Error Module Reference</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorModuleReferenceImpl <em>Error Module
+	 * Reference</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorModuleReferenceImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorModuleReference()
 	 * @generated
@@ -655,36 +643,36 @@
 	int ERROR_MODULE_REFERENCE = 7;
 
 	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_REFERENCE__QUALIFIED_NAME = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Error Module Reference</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Error Module Reference</em>' class. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_REFERENCE_FEATURE_COUNT = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Error Module Reference</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error Module Reference</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_REFERENCE_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ModuleElementImpl <em>Module Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ModuleElementImpl <em>Module Element</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ModuleElementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getModuleElement()
 	 * @generated
@@ -692,27 +680,27 @@
 	int MODULE_ELEMENT = 8;
 
 	/**
-	 * The number of structural features of the '<em>Module Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Module Element</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_ELEMENT_FEATURE_COUNT = AST_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of operations of the '<em>Module Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Module Element</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_ELEMENT_OPERATION_COUNT = AST_NODE_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.CommentImpl <em>Comment</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.CommentImpl <em>Comment</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.CommentImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getComment()
 	 * @generated
@@ -720,36 +708,35 @@
 	int COMMENT = 11;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMMENT__BODY = MODULE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Comment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Comment</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMMENT_FEATURE_COUNT = MODULE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Comment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Comment</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMMENT_OPERATION_COUNT = MODULE_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.BlockCommentImpl <em>Block Comment</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.BlockCommentImpl <em>Block Comment</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.BlockCommentImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getBlockComment()
 	 * @generated
@@ -757,36 +744,36 @@
 	int BLOCK_COMMENT = 9;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BLOCK_COMMENT__BODY = COMMENT__BODY;
 
 	/**
-	 * The number of structural features of the '<em>Block Comment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Block Comment</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BLOCK_COMMENT_FEATURE_COUNT = COMMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of operations of the '<em>Block Comment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Block Comment</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BLOCK_COMMENT_OPERATION_COUNT = COMMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorCommentImpl <em>Error Comment</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorCommentImpl <em>Error Comment</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorCommentImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorComment()
 	 * @generated
@@ -794,45 +781,45 @@
 	int ERROR_COMMENT = 12;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_COMMENT__BODY = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_COMMENT__MISSING_END_HEADER = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Error Comment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Error Comment</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_COMMENT_FEATURE_COUNT = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of operations of the '<em>Error Comment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error Comment</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_COMMENT_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorBlockCommentImpl <em>Error Block Comment</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorBlockCommentImpl <em>Error Block
+	 * Comment</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorBlockCommentImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorBlockComment()
 	 * @generated
@@ -840,45 +827,45 @@
 	int ERROR_BLOCK_COMMENT = 10;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BLOCK_COMMENT__BODY = ERROR_COMMENT__BODY;
 
 	/**
-	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BLOCK_COMMENT__MISSING_END_HEADER = ERROR_COMMENT__MISSING_END_HEADER;
 
 	/**
-	 * The number of structural features of the '<em>Error Block Comment</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Error Block Comment</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BLOCK_COMMENT_FEATURE_COUNT = ERROR_COMMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of operations of the '<em>Error Block Comment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error Block Comment</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BLOCK_COMMENT_OPERATION_COUNT = ERROR_COMMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.CommentBodyImpl <em>Comment Body</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.CommentBodyImpl <em>Comment Body</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.CommentBodyImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getCommentBody()
 	 * @generated
@@ -886,27 +873,26 @@
 	int COMMENT_BODY = 13;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMMENT_BODY__VALUE = AST_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Comment Body</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Comment Body</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMMENT_BODY_FEATURE_COUNT = AST_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Comment Body</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Comment Body</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -914,8 +900,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.acceleo.Documentation <em>Documentation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.Documentation
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getDocumentation()
 	 * @generated
@@ -923,45 +909,45 @@
 	int DOCUMENTATION = 14;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENTATION__BODY = COMMENT__BODY;
 
 	/**
-	 * The feature id for the '<em><b>Documented Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Documented Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENTATION__DOCUMENTED_ELEMENT = COMMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Documentation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Documentation</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENTATION_FEATURE_COUNT = COMMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Documentation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Documentation</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENTATION_OPERATION_COUNT = COMMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ModuleDocumentationImpl <em>Module Documentation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ModuleDocumentationImpl <em>Module
+	 * Documentation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ModuleDocumentationImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getModuleDocumentation()
 	 * @generated
@@ -969,72 +955,71 @@
 	int MODULE_DOCUMENTATION = 15;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_DOCUMENTATION__BODY = DOCUMENTATION__BODY;
 
 	/**
-	 * The feature id for the '<em><b>Documented Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Documented Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_DOCUMENTATION__DOCUMENTED_ELEMENT = DOCUMENTATION__DOCUMENTED_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Author</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Author</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_DOCUMENTATION__AUTHOR = DOCUMENTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_DOCUMENTATION__VERSION = DOCUMENTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Since</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Since</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_DOCUMENTATION__SINCE = DOCUMENTATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Module Documentation</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Module Documentation</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_DOCUMENTATION_FEATURE_COUNT = DOCUMENTATION_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of operations of the '<em>Module Documentation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Module Documentation</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_DOCUMENTATION_OPERATION_COUNT = DOCUMENTATION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl <em>Error Module Documentation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl <em>Error
+	 * Module Documentation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorModuleDocumentation()
 	 * @generated
@@ -1042,81 +1027,80 @@
 	int ERROR_MODULE_DOCUMENTATION = 16;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_DOCUMENTATION__BODY = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Documented Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Documented Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_DOCUMENTATION__DOCUMENTED_ELEMENT = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Author</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Author</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_DOCUMENTATION__AUTHOR = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_DOCUMENTATION__VERSION = ERROR_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Since</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Since</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_DOCUMENTATION__SINCE = ERROR_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_DOCUMENTATION__MISSING_END_HEADER = ERROR_FEATURE_COUNT + 5;
 
 	/**
-	 * The number of structural features of the '<em>Error Module Documentation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Error Module Documentation</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_DOCUMENTATION_FEATURE_COUNT = ERROR_FEATURE_COUNT + 6;
 
 	/**
-	 * The number of operations of the '<em>Error Module Documentation</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of operations of the '<em>Error Module Documentation</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_DOCUMENTATION_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ModuleElementDocumentationImpl <em>Module Element Documentation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ModuleElementDocumentationImpl <em>Module
+	 * Element Documentation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ModuleElementDocumentationImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getModuleElementDocumentation()
 	 * @generated
@@ -1124,54 +1108,54 @@
 	int MODULE_ELEMENT_DOCUMENTATION = 17;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_ELEMENT_DOCUMENTATION__BODY = DOCUMENTATION__BODY;
 
 	/**
-	 * The feature id for the '<em><b>Documented Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Documented Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_ELEMENT_DOCUMENTATION__DOCUMENTED_ELEMENT = DOCUMENTATION__DOCUMENTED_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Parameter Documentation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Parameter Documentation</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_ELEMENT_DOCUMENTATION__PARAMETER_DOCUMENTATION = DOCUMENTATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Module Element Documentation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Module Element Documentation</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_ELEMENT_DOCUMENTATION_FEATURE_COUNT = DOCUMENTATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Module Element Documentation</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of operations of the '<em>Module Element Documentation</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MODULE_ELEMENT_DOCUMENTATION_OPERATION_COUNT = DOCUMENTATION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorModuleElementDocumentationImpl <em>Error Module Element Documentation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorModuleElementDocumentationImpl
+	 * <em>Error Module Element Documentation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorModuleElementDocumentationImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorModuleElementDocumentation()
 	 * @generated
@@ -1179,63 +1163,63 @@
 	int ERROR_MODULE_ELEMENT_DOCUMENTATION = 18;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_ELEMENT_DOCUMENTATION__BODY = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Documented Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Documented Element</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_ELEMENT_DOCUMENTATION__DOCUMENTED_ELEMENT = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Parameter Documentation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Parameter Documentation</b></em>' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_ELEMENT_DOCUMENTATION__PARAMETER_DOCUMENTATION = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_ELEMENT_DOCUMENTATION__MISSING_END_HEADER = ERROR_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the '<em>Error Module Element Documentation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Error Module Element Documentation</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_ELEMENT_DOCUMENTATION_FEATURE_COUNT = ERROR_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of operations of the '<em>Error Module Element Documentation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error Module Element Documentation</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_MODULE_ELEMENT_DOCUMENTATION_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ParameterDocumentationImpl <em>Parameter Documentation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ParameterDocumentationImpl <em>Parameter
+	 * Documentation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ParameterDocumentationImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getParameterDocumentation()
 	 * @generated
@@ -1243,36 +1227,36 @@
 	int PARAMETER_DOCUMENTATION = 19;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PARAMETER_DOCUMENTATION__BODY = COMMENT__BODY;
 
 	/**
-	 * The number of structural features of the '<em>Parameter Documentation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Parameter Documentation</em>' class. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PARAMETER_DOCUMENTATION_FEATURE_COUNT = COMMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of operations of the '<em>Parameter Documentation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Parameter Documentation</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PARAMETER_DOCUMENTATION_OPERATION_COUNT = COMMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.DocumentedElement <em>Documented Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.DocumentedElement <em>Documented Element</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.DocumentedElement
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getDocumentedElement()
 	 * @generated
@@ -1280,45 +1264,45 @@
 	int DOCUMENTED_ELEMENT = 20;
 
 	/**
-	 * The feature id for the '<em><b>Documentation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENTED_ELEMENT__DOCUMENTATION = AST_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Deprecated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Deprecated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENTED_ELEMENT__DEPRECATED = AST_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Documented Element</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Documented Element</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENTED_ELEMENT_FEATURE_COUNT = AST_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of operations of the '<em>Documented Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Documented Element</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DOCUMENTED_ELEMENT_OPERATION_COUNT = AST_NODE_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.BlockImpl <em>Block</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.BlockImpl <em>Block</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.BlockImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getBlock()
 	 * @generated
@@ -1326,45 +1310,44 @@
 	int BLOCK = 24;
 
 	/**
-	 * The feature id for the '<em><b>Statements</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Statements</b></em>' containment reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BLOCK__STATEMENTS = AST_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Inlined</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Inlined</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BLOCK__INLINED = AST_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Block</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Block</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BLOCK_FEATURE_COUNT = AST_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of operations of the '<em>Block</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Block</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BLOCK_OPERATION_COUNT = AST_NODE_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.TypedElementImpl <em>Typed Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.TypedElementImpl <em>Typed Element</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.TypedElementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getTypedElement()
 	 * @generated
@@ -1372,36 +1355,35 @@
 	int TYPED_ELEMENT = 25;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TYPED_ELEMENT__TYPE = 0;
 
 	/**
-	 * The feature id for the '<em><b>Type Aql</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type Aql</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TYPED_ELEMENT__TYPE_AQL = 1;
 
 	/**
-	 * The number of structural features of the '<em>Typed Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Typed Element</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TYPED_ELEMENT_FEATURE_COUNT = 2;
 
 	/**
-	 * The number of operations of the '<em>Typed Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Typed Element</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1409,8 +1391,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.acceleo.impl.TemplateImpl <em>Template</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.TemplateImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getTemplate()
 	 * @generated
@@ -1418,108 +1400,106 @@
 	int TEMPLATE = 26;
 
 	/**
-	 * The feature id for the '<em><b>Documentation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEMPLATE__DOCUMENTATION = MODULE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Deprecated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Deprecated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEMPLATE__DEPRECATED = MODULE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEMPLATE__NAME = MODULE_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEMPLATE__PARAMETERS = MODULE_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Guard</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEMPLATE__GUARD = MODULE_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Post</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Post</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEMPLATE__POST = MODULE_ELEMENT_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Main</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Main</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEMPLATE__MAIN = MODULE_ELEMENT_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEMPLATE__VISIBILITY = MODULE_ELEMENT_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEMPLATE__BODY = MODULE_ELEMENT_FEATURE_COUNT + 8;
 
 	/**
-	 * The number of structural features of the '<em>Template</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Template</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEMPLATE_FEATURE_COUNT = MODULE_ELEMENT_FEATURE_COUNT + 9;
 
 	/**
-	 * The number of operations of the '<em>Template</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Template</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEMPLATE_OPERATION_COUNT = MODULE_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorTemplateImpl <em>Error Template</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorTemplateImpl <em>Error Template</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorTemplateImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorTemplate()
 	 * @generated
@@ -1527,198 +1507,196 @@
 	int ERROR_TEMPLATE = 27;
 
 	/**
-	 * The feature id for the '<em><b>Documentation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__DOCUMENTATION = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Deprecated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Deprecated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__DEPRECATED = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__NAME = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__PARAMETERS = ERROR_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Guard</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__GUARD = ERROR_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Post</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Post</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__POST = ERROR_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Main</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Main</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__MAIN = ERROR_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__VISIBILITY = ERROR_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__BODY = ERROR_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>Missing Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Visibility</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__MISSING_VISIBILITY = ERROR_FEATURE_COUNT + 9;
 
 	/**
-	 * The feature id for the '<em><b>Missing Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__MISSING_NAME = ERROR_FEATURE_COUNT + 10;
 
 	/**
-	 * The feature id for the '<em><b>Missing Open Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Open Parenthesis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__MISSING_OPEN_PARENTHESIS = ERROR_FEATURE_COUNT + 11;
 
 	/**
-	 * The feature id for the '<em><b>Missing Parameters</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Parameters</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__MISSING_PARAMETERS = ERROR_FEATURE_COUNT + 12;
 
 	/**
-	 * The feature id for the '<em><b>Missing Close Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Close Parenthesis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__MISSING_CLOSE_PARENTHESIS = ERROR_FEATURE_COUNT + 13;
 
 	/**
-	 * The feature id for the '<em><b>Missing Guard Open Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Guard Open Parenthesis</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__MISSING_GUARD_OPEN_PARENTHESIS = ERROR_FEATURE_COUNT + 14;
 
 	/**
-	 * The feature id for the '<em><b>Missing Guard Close Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Guard Close Parenthesis</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__MISSING_GUARD_CLOSE_PARENTHESIS = ERROR_FEATURE_COUNT + 15;
 
 	/**
-	 * The feature id for the '<em><b>Missing Post Close Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Post Close Parenthesis</b></em>' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__MISSING_POST_CLOSE_PARENTHESIS = ERROR_FEATURE_COUNT + 16;
 
 	/**
-	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__MISSING_END_HEADER = ERROR_FEATURE_COUNT + 17;
 
 	/**
-	 * The feature id for the '<em><b>Missing End</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE__MISSING_END = ERROR_FEATURE_COUNT + 18;
 
 	/**
-	 * The number of structural features of the '<em>Error Template</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Error Template</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE_FEATURE_COUNT = ERROR_FEATURE_COUNT + 19;
 
 	/**
-	 * The number of operations of the '<em>Error Template</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error Template</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_TEMPLATE_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.QueryImpl <em>Query</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.QueryImpl <em>Query</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.QueryImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getQuery()
 	 * @generated
@@ -1726,99 +1704,96 @@
 	int QUERY = 28;
 
 	/**
-	 * The feature id for the '<em><b>Documentation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int QUERY__DOCUMENTATION = MODULE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Deprecated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Deprecated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int QUERY__DEPRECATED = MODULE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int QUERY__NAME = MODULE_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int QUERY__TYPE = MODULE_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Type Aql</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type Aql</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int QUERY__TYPE_AQL = MODULE_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int QUERY__PARAMETERS = MODULE_ELEMENT_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int QUERY__VISIBILITY = MODULE_ELEMENT_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int QUERY__BODY = MODULE_ELEMENT_FEATURE_COUNT + 7;
 
 	/**
-	 * The number of structural features of the '<em>Query</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Query</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int QUERY_FEATURE_COUNT = MODULE_ELEMENT_FEATURE_COUNT + 8;
 
 	/**
-	 * The number of operations of the '<em>Query</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Query</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int QUERY_OPERATION_COUNT = MODULE_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorQueryImpl <em>Error Query</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorQueryImpl <em>Error Query</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorQueryImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorQuery()
 	 * @generated
@@ -1826,171 +1801,169 @@
 	int ERROR_QUERY = 29;
 
 	/**
-	 * The feature id for the '<em><b>Documentation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__DOCUMENTATION = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Deprecated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Deprecated</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__DEPRECATED = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__NAME = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__TYPE = ERROR_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Type Aql</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type Aql</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__TYPE_AQL = ERROR_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__PARAMETERS = ERROR_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__VISIBILITY = ERROR_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__BODY = ERROR_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Missing Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Visibility</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__MISSING_VISIBILITY = ERROR_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>Missing Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__MISSING_NAME = ERROR_FEATURE_COUNT + 9;
 
 	/**
-	 * The feature id for the '<em><b>Missing Open Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Open Parenthesis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__MISSING_OPEN_PARENTHESIS = ERROR_FEATURE_COUNT + 10;
 
 	/**
-	 * The feature id for the '<em><b>Missing Parameters</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Parameters</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__MISSING_PARAMETERS = ERROR_FEATURE_COUNT + 11;
 
 	/**
-	 * The feature id for the '<em><b>Missing Close Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Close Parenthesis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__MISSING_CLOSE_PARENTHESIS = ERROR_FEATURE_COUNT + 12;
 
 	/**
-	 * The feature id for the '<em><b>Missing Colon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Colon</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__MISSING_COLON = ERROR_FEATURE_COUNT + 13;
 
 	/**
-	 * The feature id for the '<em><b>Missing Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Type</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__MISSING_TYPE = ERROR_FEATURE_COUNT + 14;
 
 	/**
-	 * The feature id for the '<em><b>Missing Equal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Equal</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__MISSING_EQUAL = ERROR_FEATURE_COUNT + 15;
 
 	/**
-	 * The feature id for the '<em><b>Missing End</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY__MISSING_END = ERROR_FEATURE_COUNT + 16;
 
 	/**
-	 * The number of structural features of the '<em>Error Query</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Error Query</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_QUERY_FEATURE_COUNT = ERROR_FEATURE_COUNT + 17;
 
 	/**
-	 * The number of operations of the '<em>Error Query</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error Query</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1998,8 +1971,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ExpressionImpl <em>Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ExpressionImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getExpression()
 	 * @generated
@@ -2007,45 +1980,44 @@
 	int EXPRESSION = 30;
 
 	/**
-	 * The feature id for the '<em><b>Ast</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ast</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EXPRESSION__AST = AST_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Aql</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Aql</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EXPRESSION__AQL = AST_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Expression</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EXPRESSION_FEATURE_COUNT = AST_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of operations of the '<em>Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Expression</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EXPRESSION_OPERATION_COUNT = AST_NODE_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorExpressionImpl <em>Error Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorExpressionImpl <em>Error
+	 * Expression</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorExpressionImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorExpression()
 	 * @generated
@@ -2053,36 +2025,35 @@
 	int ERROR_EXPRESSION = 31;
 
 	/**
-	 * The feature id for the '<em><b>Ast</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Ast</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_EXPRESSION__AST = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Aql</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Aql</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_EXPRESSION__AQL = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Error Expression</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Error Expression</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_EXPRESSION_FEATURE_COUNT = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of operations of the '<em>Error Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error Expression</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2090,8 +2061,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.acceleo.impl.VariableImpl <em>Variable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.VariableImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getVariable()
 	 * @generated
@@ -2099,54 +2070,52 @@
 	int VARIABLE = 32;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VARIABLE__TYPE = TYPED_ELEMENT__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Type Aql</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type Aql</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VARIABLE__TYPE_AQL = TYPED_ELEMENT__TYPE_AQL;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VARIABLE__NAME = TYPED_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Variable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Variable</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VARIABLE_FEATURE_COUNT = TYPED_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Variable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Variable</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int VARIABLE_OPERATION_COUNT = TYPED_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorVariableImpl <em>Error Variable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorVariableImpl <em>Error Variable</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorVariableImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorVariable()
 	 * @generated
@@ -2154,81 +2123,79 @@
 	int ERROR_VARIABLE = 33;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_VARIABLE__TYPE = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Type Aql</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type Aql</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_VARIABLE__TYPE_AQL = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_VARIABLE__NAME = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Missing Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_VARIABLE__MISSING_NAME = ERROR_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Missing Colon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Colon</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_VARIABLE__MISSING_COLON = ERROR_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Missing Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Type</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_VARIABLE__MISSING_TYPE = ERROR_FEATURE_COUNT + 5;
 
 	/**
-	 * The number of structural features of the '<em>Error Variable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Error Variable</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_VARIABLE_FEATURE_COUNT = ERROR_FEATURE_COUNT + 6;
 
 	/**
-	 * The number of operations of the '<em>Error Variable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error Variable</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_VARIABLE_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.BindingImpl <em>Binding</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.BindingImpl <em>Binding</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.BindingImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getBinding()
 	 * @generated
@@ -2236,63 +2203,60 @@
 	int BINDING = 34;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BINDING__TYPE = VARIABLE__TYPE;
 
 	/**
-	 * The feature id for the '<em><b>Type Aql</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type Aql</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BINDING__TYPE_AQL = VARIABLE__TYPE_AQL;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BINDING__NAME = VARIABLE__NAME;
 
 	/**
-	 * The feature id for the '<em><b>Init Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Init Expression</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BINDING__INIT_EXPRESSION = VARIABLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Binding</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Binding</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BINDING_FEATURE_COUNT = VARIABLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Binding</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Binding</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BINDING_OPERATION_COUNT = VARIABLE_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorBindingImpl <em>Error Binding</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorBindingImpl <em>Error Binding</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorBindingImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorBinding()
 	 * @generated
@@ -2300,108 +2264,106 @@
 	int ERROR_BINDING = 35;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BINDING__TYPE = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Type Aql</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Type Aql</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BINDING__TYPE_AQL = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BINDING__NAME = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Init Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Init Expression</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BINDING__INIT_EXPRESSION = ERROR_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Missing Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BINDING__MISSING_NAME = ERROR_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Missing Colon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Colon</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BINDING__MISSING_COLON = ERROR_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Missing Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Type</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BINDING__MISSING_TYPE = ERROR_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Missing Affectation Symbole</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Affectation Symbole</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BINDING__MISSING_AFFECTATION_SYMBOLE = ERROR_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Missing Affectation Symbole Position</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Affectation Symbole Position</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BINDING__MISSING_AFFECTATION_SYMBOLE_POSITION = ERROR_FEATURE_COUNT + 8;
 
 	/**
-	 * The number of structural features of the '<em>Error Binding</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Error Binding</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BINDING_FEATURE_COUNT = ERROR_FEATURE_COUNT + 9;
 
 	/**
-	 * The number of operations of the '<em>Error Binding</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error Binding</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_BINDING_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.Statement <em>Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.Statement <em>Statement</em>}' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.Statement
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getStatement()
 	 * @generated
@@ -2409,27 +2371,27 @@
 	int STATEMENT = 36;
 
 	/**
-	 * The number of structural features of the '<em>Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STATEMENT_FEATURE_COUNT = AST_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of operations of the '<em>Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Statement</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int STATEMENT_OPERATION_COUNT = AST_NODE_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.LeafStatementImpl <em>Leaf Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.LeafStatementImpl <em>Leaf Statement</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.LeafStatementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getLeafStatement()
 	 * @generated
@@ -2437,36 +2399,36 @@
 	int LEAF_STATEMENT = 37;
 
 	/**
-	 * The feature id for the '<em><b>New Line Needed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>New Line Needed</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LEAF_STATEMENT__NEW_LINE_NEEDED = STATEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Leaf Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Leaf Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LEAF_STATEMENT_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Leaf Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Leaf Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LEAF_STATEMENT_OPERATION_COUNT = STATEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ExpressionStatementImpl <em>Expression Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ExpressionStatementImpl <em>Expression
+	 * Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ExpressionStatementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getExpressionStatement()
 	 * @generated
@@ -2474,45 +2436,45 @@
 	int EXPRESSION_STATEMENT = 38;
 
 	/**
-	 * The feature id for the '<em><b>New Line Needed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>New Line Needed</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EXPRESSION_STATEMENT__NEW_LINE_NEEDED = LEAF_STATEMENT__NEW_LINE_NEEDED;
 
 	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Expression</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EXPRESSION_STATEMENT__EXPRESSION = LEAF_STATEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Expression Statement</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Expression Statement</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EXPRESSION_STATEMENT_FEATURE_COUNT = LEAF_STATEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Expression Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Expression Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int EXPRESSION_STATEMENT_OPERATION_COUNT = LEAF_STATEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorExpressionStatementImpl <em>Error Expression Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorExpressionStatementImpl <em>Error
+	 * Expression Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorExpressionStatementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorExpressionStatement()
 	 * @generated
@@ -2520,54 +2482,54 @@
 	int ERROR_EXPRESSION_STATEMENT = 39;
 
 	/**
-	 * The feature id for the '<em><b>New Line Needed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>New Line Needed</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_EXPRESSION_STATEMENT__NEW_LINE_NEEDED = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Expression</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_EXPRESSION_STATEMENT__EXPRESSION = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_EXPRESSION_STATEMENT__MISSING_END_HEADER = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Error Expression Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Error Expression Statement</em>' class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_EXPRESSION_STATEMENT_FEATURE_COUNT = ERROR_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of operations of the '<em>Error Expression Statement</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of operations of the '<em>Error Expression Statement</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_EXPRESSION_STATEMENT_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ProtectedAreaImpl <em>Protected Area</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ProtectedAreaImpl <em>Protected Area</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ProtectedAreaImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getProtectedArea()
 	 * @generated
@@ -2575,45 +2537,45 @@
 	int PROTECTED_AREA = 40;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PROTECTED_AREA__ID = STATEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PROTECTED_AREA__BODY = STATEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Protected Area</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Protected Area</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PROTECTED_AREA_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of operations of the '<em>Protected Area</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Protected Area</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PROTECTED_AREA_OPERATION_COUNT = STATEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl <em>Error Protected Area</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl <em>Error Protected
+	 * Area</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorProtectedAreaImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorProtectedArea()
 	 * @generated
@@ -2621,81 +2583,81 @@
 	int ERROR_PROTECTED_AREA = 41;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_PROTECTED_AREA__ID = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_PROTECTED_AREA__BODY = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Missing Open Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Open Parenthesis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_PROTECTED_AREA__MISSING_OPEN_PARENTHESIS = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Missing Close Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Close Parenthesis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_PROTECTED_AREA__MISSING_CLOSE_PARENTHESIS = ERROR_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_PROTECTED_AREA__MISSING_END_HEADER = ERROR_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Missing End</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_PROTECTED_AREA__MISSING_END = ERROR_FEATURE_COUNT + 5;
 
 	/**
-	 * The number of structural features of the '<em>Error Protected Area</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Error Protected Area</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_PROTECTED_AREA_FEATURE_COUNT = ERROR_FEATURE_COUNT + 6;
 
 	/**
-	 * The number of operations of the '<em>Error Protected Area</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error Protected Area</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_PROTECTED_AREA_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ForStatementImpl <em>For Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ForStatementImpl <em>For Statement</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ForStatementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getForStatement()
 	 * @generated
@@ -2703,54 +2665,54 @@
 	int FOR_STATEMENT = 42;
 
 	/**
-	 * The feature id for the '<em><b>Binding</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Binding</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FOR_STATEMENT__BINDING = STATEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Separator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Separator</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FOR_STATEMENT__SEPARATOR = STATEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FOR_STATEMENT__BODY = STATEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>For Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>For Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FOR_STATEMENT_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of operations of the '<em>For Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>For Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FOR_STATEMENT_OPERATION_COUNT = STATEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorForStatementImpl <em>Error For Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorForStatementImpl <em>Error For
+	 * Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorForStatementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorForStatement()
 	 * @generated
@@ -2758,108 +2720,108 @@
 	int ERROR_FOR_STATEMENT = 43;
 
 	/**
-	 * The feature id for the '<em><b>Binding</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Binding</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FOR_STATEMENT__BINDING = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Separator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Separator</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FOR_STATEMENT__SEPARATOR = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FOR_STATEMENT__BODY = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Missing Open Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Open Parenthesis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FOR_STATEMENT__MISSING_OPEN_PARENTHESIS = ERROR_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Missing Binding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Binding</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FOR_STATEMENT__MISSING_BINDING = ERROR_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Missing Close Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Close Parenthesis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FOR_STATEMENT__MISSING_CLOSE_PARENTHESIS = ERROR_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Missing Separator Close Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Separator Close Parenthesis</b></em>' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FOR_STATEMENT__MISSING_SEPARATOR_CLOSE_PARENTHESIS = ERROR_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FOR_STATEMENT__MISSING_END_HEADER = ERROR_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Missing End</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FOR_STATEMENT__MISSING_END = ERROR_FEATURE_COUNT + 8;
 
 	/**
-	 * The number of structural features of the '<em>Error For Statement</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Error For Statement</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FOR_STATEMENT_FEATURE_COUNT = ERROR_FEATURE_COUNT + 9;
 
 	/**
-	 * The number of operations of the '<em>Error For Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error For Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FOR_STATEMENT_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.IfStatementImpl <em>If Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.IfStatementImpl <em>If Statement</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.IfStatementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getIfStatement()
 	 * @generated
@@ -2867,54 +2829,54 @@
 	int IF_STATEMENT = 44;
 
 	/**
-	 * The feature id for the '<em><b>Condition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Condition</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IF_STATEMENT__CONDITION = STATEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Then</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Then</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IF_STATEMENT__THEN = STATEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Else</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Else</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IF_STATEMENT__ELSE = STATEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>If Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>If Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IF_STATEMENT_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of operations of the '<em>If Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>If Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IF_STATEMENT_OPERATION_COUNT = STATEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl <em>Error If Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl <em>Error If
+	 * Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorIfStatementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorIfStatement()
 	 * @generated
@@ -2922,90 +2884,90 @@
 	int ERROR_IF_STATEMENT = 45;
 
 	/**
-	 * The feature id for the '<em><b>Condition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Condition</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_IF_STATEMENT__CONDITION = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Then</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Then</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_IF_STATEMENT__THEN = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Else</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Else</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_IF_STATEMENT__ELSE = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Missing Open Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Open Parenthesis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_IF_STATEMENT__MISSING_OPEN_PARENTHESIS = ERROR_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Missing Close Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Close Parenthesis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_IF_STATEMENT__MISSING_CLOSE_PARENTHESIS = ERROR_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_IF_STATEMENT__MISSING_END_HEADER = ERROR_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Missing End</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_IF_STATEMENT__MISSING_END = ERROR_FEATURE_COUNT + 6;
 
 	/**
-	 * The number of structural features of the '<em>Error If Statement</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Error If Statement</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_IF_STATEMENT_FEATURE_COUNT = ERROR_FEATURE_COUNT + 7;
 
 	/**
-	 * The number of operations of the '<em>Error If Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error If Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_IF_STATEMENT_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.LetStatementImpl <em>Let Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.LetStatementImpl <em>Let Statement</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.LetStatementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getLetStatement()
 	 * @generated
@@ -3013,45 +2975,45 @@
 	int LET_STATEMENT = 46;
 
 	/**
-	 * The feature id for the '<em><b>Variables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Variables</b></em>' containment reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LET_STATEMENT__VARIABLES = STATEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LET_STATEMENT__BODY = STATEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Let Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Let Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LET_STATEMENT_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of operations of the '<em>Let Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Let Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LET_STATEMENT_OPERATION_COUNT = STATEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorLetStatementImpl <em>Error Let Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorLetStatementImpl <em>Error Let
+	 * Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorLetStatementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorLetStatement()
 	 * @generated
@@ -3059,72 +3021,72 @@
 	int ERROR_LET_STATEMENT = 47;
 
 	/**
-	 * The feature id for the '<em><b>Variables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Variables</b></em>' containment reference list. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_LET_STATEMENT__VARIABLES = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_LET_STATEMENT__BODY = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Missing Bindings</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Bindings</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_LET_STATEMENT__MISSING_BINDINGS = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_LET_STATEMENT__MISSING_END_HEADER = ERROR_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Missing End</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_LET_STATEMENT__MISSING_END = ERROR_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of structural features of the '<em>Error Let Statement</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Error Let Statement</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_LET_STATEMENT_FEATURE_COUNT = ERROR_FEATURE_COUNT + 5;
 
 	/**
-	 * The number of operations of the '<em>Error Let Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error Let Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_LET_STATEMENT_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.FileStatementImpl <em>File Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.FileStatementImpl <em>File Statement</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.FileStatementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getFileStatement()
 	 * @generated
@@ -3132,63 +3094,62 @@
 	int FILE_STATEMENT = 48;
 
 	/**
-	 * The feature id for the '<em><b>Mode</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mode</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILE_STATEMENT__MODE = STATEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Url</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Url</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILE_STATEMENT__URL = STATEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Charset</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Charset</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILE_STATEMENT__CHARSET = STATEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILE_STATEMENT__BODY = STATEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The number of structural features of the '<em>File Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>File Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILE_STATEMENT_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of operations of the '<em>File Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>File Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int FILE_STATEMENT_OPERATION_COUNT = STATEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl <em>Error File Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl <em>Error File
+	 * Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.ErrorFileStatementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorFileStatement()
 	 * @generated
@@ -3196,117 +3157,116 @@
 	int ERROR_FILE_STATEMENT = 49;
 
 	/**
-	 * The feature id for the '<em><b>Mode</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Mode</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FILE_STATEMENT__MODE = ERROR_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Url</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Url</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FILE_STATEMENT__URL = ERROR_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Charset</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Charset</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FILE_STATEMENT__CHARSET = ERROR_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FILE_STATEMENT__BODY = ERROR_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Missing Open Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Open Parenthesis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FILE_STATEMENT__MISSING_OPEN_PARENTHESIS = ERROR_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Missing Comma</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Comma</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FILE_STATEMENT__MISSING_COMMA = ERROR_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Missing Open Mode</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing Open Mode</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FILE_STATEMENT__MISSING_OPEN_MODE = ERROR_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Missing Close Parenthesis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * The feature id for the '<em><b>Missing Close Parenthesis</b></em>' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FILE_STATEMENT__MISSING_CLOSE_PARENTHESIS = ERROR_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End Header</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FILE_STATEMENT__MISSING_END_HEADER = ERROR_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>Missing End</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Missing End</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FILE_STATEMENT__MISSING_END = ERROR_FEATURE_COUNT + 9;
 
 	/**
-	 * The number of structural features of the '<em>Error File Statement</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>Error File Statement</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FILE_STATEMENT_FEATURE_COUNT = ERROR_FEATURE_COUNT + 10;
 
 	/**
-	 * The number of operations of the '<em>Error File Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Error File Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ERROR_FILE_STATEMENT_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.TextStatementImpl <em>Text Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.TextStatementImpl <em>Text Statement</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.TextStatementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getTextStatement()
 	 * @generated
@@ -3314,45 +3274,44 @@
 	int TEXT_STATEMENT = 50;
 
 	/**
-	 * The feature id for the '<em><b>New Line Needed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>New Line Needed</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEXT_STATEMENT__NEW_LINE_NEEDED = LEAF_STATEMENT__NEW_LINE_NEEDED;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEXT_STATEMENT__VALUE = LEAF_STATEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Text Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of structural features of the '<em>Text Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEXT_STATEMENT_FEATURE_COUNT = LEAF_STATEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Text Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>Text Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEXT_STATEMENT_OPERATION_COUNT = LEAF_STATEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.impl.NewLineStatementImpl <em>New Line Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.impl.NewLineStatementImpl <em>New Line
+	 * Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.impl.NewLineStatementImpl
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getNewLineStatement()
 	 * @generated
@@ -3360,45 +3319,44 @@
 	int NEW_LINE_STATEMENT = 51;
 
 	/**
-	 * The feature id for the '<em><b>New Line Needed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>New Line Needed</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NEW_LINE_STATEMENT__NEW_LINE_NEEDED = TEXT_STATEMENT__NEW_LINE_NEEDED;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NEW_LINE_STATEMENT__VALUE = TEXT_STATEMENT__VALUE;
 
 	/**
-	 * The feature id for the '<em><b>Indentation Needed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Indentation Needed</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NEW_LINE_STATEMENT__INDENTATION_NEEDED = TEXT_STATEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>New Line Statement</em>' class.
-	 * <!-- begin-user-doc -->
+	 * The number of structural features of the '<em>New Line Statement</em>' class. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int NEW_LINE_STATEMENT_FEATURE_COUNT = TEXT_STATEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>New Line Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The number of operations of the '<em>New Line Statement</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3406,8 +3364,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.acceleo.VisibilityKind <em>Visibility Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.VisibilityKind
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getVisibilityKind()
 	 * @generated
@@ -3416,8 +3374,8 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.acceleo.OpenModeKind <em>Open Mode Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.acceleo.OpenModeKind
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getOpenModeKind()
 	 * @generated
@@ -3425,9 +3383,9 @@
 	int OPEN_MODE_KIND = 53;
 
 	/**
-	 * The meta object id for the '<em>AST Result</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>AST Result</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see org.eclipse.acceleo.query.parser.AstResult
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getASTResult()
 	 * @generated
@@ -3435,9 +3393,9 @@
 	int AST_RESULT = 54;
 
 	/**
-	 * The meta object id for the '<em>Module Qualified Name</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Module Qualified Name</em>' data type. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see java.lang.String
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getModuleQualifiedName()
 	 * @generated
@@ -3445,9 +3403,9 @@
 	int MODULE_QUALIFIED_NAME = 55;
 
 	/**
-	 * The meta object id for the '<em>Ast Result</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The meta object id for the '<em>Ast Result</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see org.eclipse.acceleo.aql.parser.AcceleoAstResult
 	 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getAcceleoAstResult()
 	 * @generated
@@ -3455,9 +3413,9 @@
 	int ACCELEO_AST_RESULT = 56;
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.Module <em>Module</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.Module <em>Module</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Module</em>'.
 	 * @see org.eclipse.acceleo.Module
 	 * @generated
@@ -3465,9 +3423,9 @@
 	EClass getModule();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.acceleo.Module#getMetamodels <em>Metamodels</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference list '{@link org.eclipse.acceleo.Module#getMetamodels
+	 * <em>Metamodels</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Metamodels</em>'.
 	 * @see org.eclipse.acceleo.Module#getMetamodels()
 	 * @see #getModule()
@@ -3476,9 +3434,9 @@
 	EReference getModule_Metamodels();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Module#getExtends <em>Extends</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Module#getExtends
+	 * <em>Extends</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Extends</em>'.
 	 * @see org.eclipse.acceleo.Module#getExtends()
 	 * @see #getModule()
@@ -3487,9 +3445,10 @@
 	EReference getModule_Extends();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.acceleo.Module#getImports <em>Imports</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.acceleo.Module#getImports <em>Imports</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Imports</em>'.
 	 * @see org.eclipse.acceleo.Module#getImports()
 	 * @see #getModule()
@@ -3498,9 +3457,10 @@
 	EReference getModule_Imports();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.acceleo.Module#getModuleElements <em>Module Elements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.acceleo.Module#getModuleElements <em>Module Elements</em>}'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Module Elements</em>'.
 	 * @see org.eclipse.acceleo.Module#getModuleElements()
 	 * @see #getModule()
@@ -3509,9 +3469,9 @@
 	EReference getModule_ModuleElements();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.Module#getStartHeaderPosition <em>Start Header Position</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.Module#getStartHeaderPosition
+	 * <em>Start Header Position</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Start Header Position</em>'.
 	 * @see org.eclipse.acceleo.Module#getStartHeaderPosition()
 	 * @see #getModule()
@@ -3520,9 +3480,9 @@
 	EAttribute getModule_StartHeaderPosition();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.Module#getEndHeaderPosition <em>End Header Position</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.Module#getEndHeaderPosition
+	 * <em>End Header Position</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>End Header Position</em>'.
 	 * @see org.eclipse.acceleo.Module#getEndHeaderPosition()
 	 * @see #getModule()
@@ -3532,8 +3492,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.Module#getAst <em>Ast</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Ast</em>'.
 	 * @see org.eclipse.acceleo.Module#getAst()
 	 * @see #getModule()
@@ -3542,9 +3502,9 @@
 	EAttribute getModule_Ast();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorModule <em>Error Module</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorModule <em>Error Module</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Module</em>'.
 	 * @see org.eclipse.acceleo.ErrorModule
 	 * @generated
@@ -3552,9 +3512,10 @@
 	EClass getErrorModule();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorModule#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorModule#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Open Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorModule#getMissingOpenParenthesis()
 	 * @see #getErrorModule()
@@ -3563,9 +3524,9 @@
 	EAttribute getErrorModule_MissingOpenParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorModule#getMissingEPackage <em>Missing EPackage</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorModule#getMissingEPackage
+	 * <em>Missing EPackage</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing EPackage</em>'.
 	 * @see org.eclipse.acceleo.ErrorModule#getMissingEPackage()
 	 * @see #getErrorModule()
@@ -3574,9 +3535,10 @@
 	EAttribute getErrorModule_MissingEPackage();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorModule#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorModule#getMissingCloseParenthesis <em>Missing Close
+	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Close Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorModule#getMissingCloseParenthesis()
 	 * @see #getErrorModule()
@@ -3585,9 +3547,9 @@
 	EAttribute getErrorModule_MissingCloseParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorModule#getMissingEndHeader <em>Missing End Header</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorModule#getMissingEndHeader
+	 * <em>Missing End Header</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End Header</em>'.
 	 * @see org.eclipse.acceleo.ErrorModule#getMissingEndHeader()
 	 * @see #getErrorModule()
@@ -3596,9 +3558,9 @@
 	EAttribute getErrorModule_MissingEndHeader();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.Metamodel <em>Metamodel</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.Metamodel <em>Metamodel</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Metamodel</em>'.
 	 * @see org.eclipse.acceleo.Metamodel
 	 * @generated
@@ -3606,9 +3568,9 @@
 	EClass getMetamodel();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.acceleo.Metamodel#getReferencedPackage <em>Referenced Package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference '{@link org.eclipse.acceleo.Metamodel#getReferencedPackage
+	 * <em>Referenced Package</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Referenced Package</em>'.
 	 * @see org.eclipse.acceleo.Metamodel#getReferencedPackage()
 	 * @see #getMetamodel()
@@ -3617,9 +3579,9 @@
 	EReference getMetamodel_ReferencedPackage();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorMetamodel <em>Error Metamodel</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorMetamodel <em>Error
+	 * Metamodel</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Metamodel</em>'.
 	 * @see org.eclipse.acceleo.ErrorMetamodel
 	 * @generated
@@ -3627,9 +3589,9 @@
 	EClass getErrorMetamodel();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorMetamodel#getFragment <em>Fragment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorMetamodel#getFragment
+	 * <em>Fragment</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Fragment</em>'.
 	 * @see org.eclipse.acceleo.ErrorMetamodel#getFragment()
 	 * @see #getErrorMetamodel()
@@ -3638,9 +3600,9 @@
 	EAttribute getErrorMetamodel_Fragment();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorMetamodel#getMissingEndQuote <em>Missing End Quote</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorMetamodel#getMissingEndQuote
+	 * <em>Missing End Quote</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End Quote</em>'.
 	 * @see org.eclipse.acceleo.ErrorMetamodel#getMissingEndQuote()
 	 * @see #getErrorMetamodel()
@@ -3649,9 +3611,9 @@
 	EAttribute getErrorMetamodel_MissingEndQuote();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.Import <em>Import</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.Import <em>Import</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Import</em>'.
 	 * @see org.eclipse.acceleo.Import
 	 * @generated
@@ -3659,9 +3621,9 @@
 	EClass getImport();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Import#getModule <em>Module</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Import#getModule
+	 * <em>Module</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Module</em>'.
 	 * @see org.eclipse.acceleo.Import#getModule()
 	 * @see #getImport()
@@ -3670,9 +3632,9 @@
 	EReference getImport_Module();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorImport <em>Error Import</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorImport <em>Error Import</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Import</em>'.
 	 * @see org.eclipse.acceleo.ErrorImport
 	 * @generated
@@ -3680,9 +3642,9 @@
 	EClass getErrorImport();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorImport#getMissingEnd <em>Missing End</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorImport#getMissingEnd
+	 * <em>Missing End</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End</em>'.
 	 * @see org.eclipse.acceleo.ErrorImport#getMissingEnd()
 	 * @see #getErrorImport()
@@ -3691,9 +3653,9 @@
 	EAttribute getErrorImport_MissingEnd();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ModuleReference <em>Module Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ModuleReference <em>Module
+	 * Reference</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Module Reference</em>'.
 	 * @see org.eclipse.acceleo.ModuleReference
 	 * @generated
@@ -3701,9 +3663,9 @@
 	EClass getModuleReference();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ModuleReference#getQualifiedName <em>Qualified Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ModuleReference#getQualifiedName
+	 * <em>Qualified Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Qualified Name</em>'.
 	 * @see org.eclipse.acceleo.ModuleReference#getQualifiedName()
 	 * @see #getModuleReference()
@@ -3712,9 +3674,9 @@
 	EAttribute getModuleReference_QualifiedName();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorModuleReference <em>Error Module Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorModuleReference <em>Error Module
+	 * Reference</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Module Reference</em>'.
 	 * @see org.eclipse.acceleo.ErrorModuleReference
 	 * @generated
@@ -3723,8 +3685,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.ModuleElement <em>Module Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Module Element</em>'.
 	 * @see org.eclipse.acceleo.ModuleElement
 	 * @generated
@@ -3732,9 +3694,9 @@
 	EClass getModuleElement();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.Comment <em>Comment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.Comment <em>Comment</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Comment</em>'.
 	 * @see org.eclipse.acceleo.Comment
 	 * @generated
@@ -3742,9 +3704,9 @@
 	EClass getComment();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Comment#getBody <em>Body</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Comment#getBody
+	 * <em>Body</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Body</em>'.
 	 * @see org.eclipse.acceleo.Comment#getBody()
 	 * @see #getComment()
@@ -3754,8 +3716,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.BlockComment <em>Block Comment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Block Comment</em>'.
 	 * @see org.eclipse.acceleo.BlockComment
 	 * @generated
@@ -3763,9 +3725,9 @@
 	EClass getBlockComment();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorBlockComment <em>Error Block Comment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorBlockComment <em>Error Block
+	 * Comment</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Block Comment</em>'.
 	 * @see org.eclipse.acceleo.ErrorBlockComment
 	 * @generated
@@ -3774,8 +3736,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorComment <em>Error Comment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Comment</em>'.
 	 * @see org.eclipse.acceleo.ErrorComment
 	 * @generated
@@ -3783,9 +3745,9 @@
 	EClass getErrorComment();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorComment#getMissingEndHeader <em>Missing End Header</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorComment#getMissingEndHeader
+	 * <em>Missing End Header</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End Header</em>'.
 	 * @see org.eclipse.acceleo.ErrorComment#getMissingEndHeader()
 	 * @see #getErrorComment()
@@ -3794,9 +3756,9 @@
 	EAttribute getErrorComment_MissingEndHeader();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.CommentBody <em>Comment Body</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.CommentBody <em>Comment Body</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Comment Body</em>'.
 	 * @see org.eclipse.acceleo.CommentBody
 	 * @generated
@@ -3804,9 +3766,9 @@
 	EClass getCommentBody();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.CommentBody#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.CommentBody#getValue
+	 * <em>Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.acceleo.CommentBody#getValue()
 	 * @see #getCommentBody()
@@ -3816,8 +3778,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.Documentation <em>Documentation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Documentation</em>'.
 	 * @see org.eclipse.acceleo.Documentation
 	 * @generated
@@ -3825,9 +3787,10 @@
 	EClass getDocumentation();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.acceleo.Documentation#getDocumentedElement <em>Documented Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.acceleo.Documentation#getDocumentedElement <em>Documented Element</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Documented Element</em>'.
 	 * @see org.eclipse.acceleo.Documentation#getDocumentedElement()
 	 * @see #getDocumentation()
@@ -3836,9 +3799,9 @@
 	EReference getDocumentation_DocumentedElement();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ModuleDocumentation <em>Module Documentation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ModuleDocumentation <em>Module
+	 * Documentation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Module Documentation</em>'.
 	 * @see org.eclipse.acceleo.ModuleDocumentation
 	 * @generated
@@ -3846,9 +3809,9 @@
 	EClass getModuleDocumentation();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ModuleDocumentation#getAuthor <em>Author</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ModuleDocumentation#getAuthor
+	 * <em>Author</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Author</em>'.
 	 * @see org.eclipse.acceleo.ModuleDocumentation#getAuthor()
 	 * @see #getModuleDocumentation()
@@ -3857,9 +3820,9 @@
 	EAttribute getModuleDocumentation_Author();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ModuleDocumentation#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ModuleDocumentation#getVersion
+	 * <em>Version</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Version</em>'.
 	 * @see org.eclipse.acceleo.ModuleDocumentation#getVersion()
 	 * @see #getModuleDocumentation()
@@ -3868,9 +3831,9 @@
 	EAttribute getModuleDocumentation_Version();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ModuleDocumentation#getSince <em>Since</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ModuleDocumentation#getSince
+	 * <em>Since</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Since</em>'.
 	 * @see org.eclipse.acceleo.ModuleDocumentation#getSince()
 	 * @see #getModuleDocumentation()
@@ -3879,9 +3842,9 @@
 	EAttribute getModuleDocumentation_Since();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorModuleDocumentation <em>Error Module Documentation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorModuleDocumentation <em>Error Module
+	 * Documentation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Module Documentation</em>'.
 	 * @see org.eclipse.acceleo.ErrorModuleDocumentation
 	 * @generated
@@ -3889,9 +3852,10 @@
 	EClass getErrorModuleDocumentation();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorModuleDocumentation#getMissingEndHeader <em>Missing End Header</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorModuleDocumentation#getMissingEndHeader <em>Missing End Header</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End Header</em>'.
 	 * @see org.eclipse.acceleo.ErrorModuleDocumentation#getMissingEndHeader()
 	 * @see #getErrorModuleDocumentation()
@@ -3900,9 +3864,9 @@
 	EAttribute getErrorModuleDocumentation_MissingEndHeader();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ModuleElementDocumentation <em>Module Element Documentation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ModuleElementDocumentation <em>Module
+	 * Element Documentation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Module Element Documentation</em>'.
 	 * @see org.eclipse.acceleo.ModuleElementDocumentation
 	 * @generated
@@ -3910,9 +3874,10 @@
 	EClass getModuleElementDocumentation();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.acceleo.ModuleElementDocumentation#getParameterDocumentation <em>Parameter Documentation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.acceleo.ModuleElementDocumentation#getParameterDocumentation <em>Parameter
+	 * Documentation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Parameter Documentation</em>'.
 	 * @see org.eclipse.acceleo.ModuleElementDocumentation#getParameterDocumentation()
 	 * @see #getModuleElementDocumentation()
@@ -3921,9 +3886,9 @@
 	EReference getModuleElementDocumentation_ParameterDocumentation();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorModuleElementDocumentation <em>Error Module Element Documentation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorModuleElementDocumentation <em>Error
+	 * Module Element Documentation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Module Element Documentation</em>'.
 	 * @see org.eclipse.acceleo.ErrorModuleElementDocumentation
 	 * @generated
@@ -3931,9 +3896,10 @@
 	EClass getErrorModuleElementDocumentation();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorModuleElementDocumentation#getMissingEndHeader <em>Missing End Header</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorModuleElementDocumentation#getMissingEndHeader <em>Missing End
+	 * Header</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End Header</em>'.
 	 * @see org.eclipse.acceleo.ErrorModuleElementDocumentation#getMissingEndHeader()
 	 * @see #getErrorModuleElementDocumentation()
@@ -3942,9 +3908,9 @@
 	EAttribute getErrorModuleElementDocumentation_MissingEndHeader();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ParameterDocumentation <em>Parameter Documentation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ParameterDocumentation <em>Parameter
+	 * Documentation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Parameter Documentation</em>'.
 	 * @see org.eclipse.acceleo.ParameterDocumentation
 	 * @generated
@@ -3952,9 +3918,9 @@
 	EClass getParameterDocumentation();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.DocumentedElement <em>Documented Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.DocumentedElement <em>Documented
+	 * Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Documented Element</em>'.
 	 * @see org.eclipse.acceleo.DocumentedElement
 	 * @generated
@@ -3962,9 +3928,10 @@
 	EClass getDocumentedElement();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.acceleo.DocumentedElement#getDocumentation <em>Documentation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.acceleo.DocumentedElement#getDocumentation <em>Documentation</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Documentation</em>'.
 	 * @see org.eclipse.acceleo.DocumentedElement#getDocumentation()
 	 * @see #getDocumentedElement()
@@ -3973,9 +3940,9 @@
 	EReference getDocumentedElement_Documentation();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.DocumentedElement#isDeprecated <em>Deprecated</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.DocumentedElement#isDeprecated
+	 * <em>Deprecated</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Deprecated</em>'.
 	 * @see org.eclipse.acceleo.DocumentedElement#isDeprecated()
 	 * @see #getDocumentedElement()
@@ -3985,8 +3952,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.NamedElement <em>Named Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Named Element</em>'.
 	 * @see org.eclipse.acceleo.NamedElement
 	 * @generated
@@ -3994,9 +3961,9 @@
 	EClass getNamedElement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.NamedElement#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.NamedElement#getName
+	 * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.acceleo.NamedElement#getName()
 	 * @see #getNamedElement()
@@ -4005,9 +3972,9 @@
 	EAttribute getNamedElement_Name();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ASTNode <em>AST Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ASTNode <em>AST Node</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>AST Node</em>'.
 	 * @see org.eclipse.acceleo.ASTNode
 	 * @generated
@@ -4015,9 +3982,9 @@
 	EClass getASTNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.Error <em>Error</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.Error <em>Error</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error</em>'.
 	 * @see org.eclipse.acceleo.Error
 	 * @generated
@@ -4025,9 +3992,9 @@
 	EClass getError();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.Block <em>Block</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.Block <em>Block</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Block</em>'.
 	 * @see org.eclipse.acceleo.Block
 	 * @generated
@@ -4035,9 +4002,10 @@
 	EClass getBlock();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.acceleo.Block#getStatements <em>Statements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.acceleo.Block#getStatements <em>Statements</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Statements</em>'.
 	 * @see org.eclipse.acceleo.Block#getStatements()
 	 * @see #getBlock()
@@ -4046,9 +4014,9 @@
 	EReference getBlock_Statements();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.Block#isInlined <em>Inlined</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.Block#isInlined
+	 * <em>Inlined</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Inlined</em>'.
 	 * @see org.eclipse.acceleo.Block#isInlined()
 	 * @see #getBlock()
@@ -4058,8 +4026,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.TypedElement <em>Typed Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Typed Element</em>'.
 	 * @see org.eclipse.acceleo.TypedElement
 	 * @generated
@@ -4067,9 +4035,9 @@
 	EClass getTypedElement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.TypedElement#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.TypedElement#getType
+	 * <em>Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Type</em>'.
 	 * @see org.eclipse.acceleo.TypedElement#getType()
 	 * @see #getTypedElement()
@@ -4078,9 +4046,10 @@
 	EAttribute getTypedElement_Type();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.TypedElement#getTypeAql <em>Type Aql</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.acceleo.TypedElement#getTypeAql <em>Type Aql</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Type Aql</em>'.
 	 * @see org.eclipse.acceleo.TypedElement#getTypeAql()
 	 * @see #getTypedElement()
@@ -4089,9 +4058,9 @@
 	EReference getTypedElement_TypeAql();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.Template <em>Template</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.Template <em>Template</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Template</em>'.
 	 * @see org.eclipse.acceleo.Template
 	 * @generated
@@ -4099,9 +4068,10 @@
 	EClass getTemplate();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.acceleo.Template#getParameters <em>Parameters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.acceleo.Template#getParameters <em>Parameters</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Parameters</em>'.
 	 * @see org.eclipse.acceleo.Template#getParameters()
 	 * @see #getTemplate()
@@ -4110,9 +4080,9 @@
 	EReference getTemplate_Parameters();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Template#getGuard <em>Guard</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Template#getGuard
+	 * <em>Guard</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Guard</em>'.
 	 * @see org.eclipse.acceleo.Template#getGuard()
 	 * @see #getTemplate()
@@ -4121,9 +4091,9 @@
 	EReference getTemplate_Guard();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Template#getPost <em>Post</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Template#getPost
+	 * <em>Post</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Post</em>'.
 	 * @see org.eclipse.acceleo.Template#getPost()
 	 * @see #getTemplate()
@@ -4133,8 +4103,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.Template#isMain <em>Main</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Main</em>'.
 	 * @see org.eclipse.acceleo.Template#isMain()
 	 * @see #getTemplate()
@@ -4143,9 +4113,9 @@
 	EAttribute getTemplate_Main();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.Template#getVisibility <em>Visibility</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.Template#getVisibility
+	 * <em>Visibility</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Visibility</em>'.
 	 * @see org.eclipse.acceleo.Template#getVisibility()
 	 * @see #getTemplate()
@@ -4154,9 +4124,9 @@
 	EAttribute getTemplate_Visibility();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Template#getBody <em>Body</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Template#getBody
+	 * <em>Body</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Body</em>'.
 	 * @see org.eclipse.acceleo.Template#getBody()
 	 * @see #getTemplate()
@@ -4166,8 +4136,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorTemplate <em>Error Template</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Template</em>'.
 	 * @see org.eclipse.acceleo.ErrorTemplate
 	 * @generated
@@ -4175,9 +4145,10 @@
 	EClass getErrorTemplate();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorTemplate#getMissingVisibility <em>Missing Visibility</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorTemplate#getMissingVisibility <em>Missing Visibility</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Visibility</em>'.
 	 * @see org.eclipse.acceleo.ErrorTemplate#getMissingVisibility()
 	 * @see #getErrorTemplate()
@@ -4186,9 +4157,9 @@
 	EAttribute getErrorTemplate_MissingVisibility();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorTemplate#getMissingName <em>Missing Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorTemplate#getMissingName
+	 * <em>Missing Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Name</em>'.
 	 * @see org.eclipse.acceleo.ErrorTemplate#getMissingName()
 	 * @see #getErrorTemplate()
@@ -4197,9 +4168,10 @@
 	EAttribute getErrorTemplate_MissingName();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorTemplate#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorTemplate#getMissingOpenParenthesis <em>Missing Open
+	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Open Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorTemplate#getMissingOpenParenthesis()
 	 * @see #getErrorTemplate()
@@ -4208,9 +4180,10 @@
 	EAttribute getErrorTemplate_MissingOpenParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorTemplate#getMissingParameters <em>Missing Parameters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorTemplate#getMissingParameters <em>Missing Parameters</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Parameters</em>'.
 	 * @see org.eclipse.acceleo.ErrorTemplate#getMissingParameters()
 	 * @see #getErrorTemplate()
@@ -4219,9 +4192,10 @@
 	EAttribute getErrorTemplate_MissingParameters();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorTemplate#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorTemplate#getMissingCloseParenthesis <em>Missing Close
+	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Close Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorTemplate#getMissingCloseParenthesis()
 	 * @see #getErrorTemplate()
@@ -4230,9 +4204,10 @@
 	EAttribute getErrorTemplate_MissingCloseParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorTemplate#getMissingGuardOpenParenthesis <em>Missing Guard Open Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorTemplate#getMissingGuardOpenParenthesis <em>Missing Guard Open
+	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Guard Open Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorTemplate#getMissingGuardOpenParenthesis()
 	 * @see #getErrorTemplate()
@@ -4241,9 +4216,10 @@
 	EAttribute getErrorTemplate_MissingGuardOpenParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorTemplate#getMissingGuardCloseParenthesis <em>Missing Guard Close Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorTemplate#getMissingGuardCloseParenthesis <em>Missing Guard Close
+	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Guard Close Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorTemplate#getMissingGuardCloseParenthesis()
 	 * @see #getErrorTemplate()
@@ -4252,9 +4228,10 @@
 	EAttribute getErrorTemplate_MissingGuardCloseParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorTemplate#getMissingPostCloseParenthesis <em>Missing Post Close Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorTemplate#getMissingPostCloseParenthesis <em>Missing Post Close
+	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Post Close Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorTemplate#getMissingPostCloseParenthesis()
 	 * @see #getErrorTemplate()
@@ -4263,9 +4240,9 @@
 	EAttribute getErrorTemplate_MissingPostCloseParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorTemplate#getMissingEndHeader <em>Missing End Header</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorTemplate#getMissingEndHeader
+	 * <em>Missing End Header</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End Header</em>'.
 	 * @see org.eclipse.acceleo.ErrorTemplate#getMissingEndHeader()
 	 * @see #getErrorTemplate()
@@ -4274,9 +4251,9 @@
 	EAttribute getErrorTemplate_MissingEndHeader();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorTemplate#getMissingEnd <em>Missing End</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorTemplate#getMissingEnd
+	 * <em>Missing End</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End</em>'.
 	 * @see org.eclipse.acceleo.ErrorTemplate#getMissingEnd()
 	 * @see #getErrorTemplate()
@@ -4285,9 +4262,9 @@
 	EAttribute getErrorTemplate_MissingEnd();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.Query <em>Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.Query <em>Query</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Query</em>'.
 	 * @see org.eclipse.acceleo.Query
 	 * @generated
@@ -4295,9 +4272,10 @@
 	EClass getQuery();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.acceleo.Query#getParameters <em>Parameters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.acceleo.Query#getParameters <em>Parameters</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Parameters</em>'.
 	 * @see org.eclipse.acceleo.Query#getParameters()
 	 * @see #getQuery()
@@ -4306,9 +4284,9 @@
 	EReference getQuery_Parameters();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.Query#getVisibility <em>Visibility</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.Query#getVisibility
+	 * <em>Visibility</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Visibility</em>'.
 	 * @see org.eclipse.acceleo.Query#getVisibility()
 	 * @see #getQuery()
@@ -4317,9 +4295,9 @@
 	EAttribute getQuery_Visibility();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Query#getBody <em>Body</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Query#getBody
+	 * <em>Body</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Body</em>'.
 	 * @see org.eclipse.acceleo.Query#getBody()
 	 * @see #getQuery()
@@ -4328,9 +4306,9 @@
 	EReference getQuery_Body();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorQuery <em>Error Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorQuery <em>Error Query</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Query</em>'.
 	 * @see org.eclipse.acceleo.ErrorQuery
 	 * @generated
@@ -4338,9 +4316,9 @@
 	EClass getErrorQuery();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingVisibility <em>Missing Visibility</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingVisibility
+	 * <em>Missing Visibility</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Visibility</em>'.
 	 * @see org.eclipse.acceleo.ErrorQuery#getMissingVisibility()
 	 * @see #getErrorQuery()
@@ -4349,9 +4327,9 @@
 	EAttribute getErrorQuery_MissingVisibility();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingName <em>Missing Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingName
+	 * <em>Missing Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Name</em>'.
 	 * @see org.eclipse.acceleo.ErrorQuery#getMissingName()
 	 * @see #getErrorQuery()
@@ -4360,9 +4338,10 @@
 	EAttribute getErrorQuery_MissingName();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorQuery#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Open Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorQuery#getMissingOpenParenthesis()
 	 * @see #getErrorQuery()
@@ -4371,9 +4350,9 @@
 	EAttribute getErrorQuery_MissingOpenParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingParameters <em>Missing Parameters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingParameters
+	 * <em>Missing Parameters</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Parameters</em>'.
 	 * @see org.eclipse.acceleo.ErrorQuery#getMissingParameters()
 	 * @see #getErrorQuery()
@@ -4382,9 +4361,10 @@
 	EAttribute getErrorQuery_MissingParameters();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorQuery#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Close Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorQuery#getMissingCloseParenthesis()
 	 * @see #getErrorQuery()
@@ -4393,9 +4373,9 @@
 	EAttribute getErrorQuery_MissingCloseParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingColon <em>Missing Colon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingColon
+	 * <em>Missing Colon</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Colon</em>'.
 	 * @see org.eclipse.acceleo.ErrorQuery#getMissingColon()
 	 * @see #getErrorQuery()
@@ -4404,9 +4384,9 @@
 	EAttribute getErrorQuery_MissingColon();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingType <em>Missing Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingType
+	 * <em>Missing Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Type</em>'.
 	 * @see org.eclipse.acceleo.ErrorQuery#getMissingType()
 	 * @see #getErrorQuery()
@@ -4415,9 +4395,9 @@
 	EAttribute getErrorQuery_MissingType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingEqual <em>Missing Equal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingEqual
+	 * <em>Missing Equal</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Equal</em>'.
 	 * @see org.eclipse.acceleo.ErrorQuery#getMissingEqual()
 	 * @see #getErrorQuery()
@@ -4426,9 +4406,9 @@
 	EAttribute getErrorQuery_MissingEqual();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingEnd <em>Missing End</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorQuery#getMissingEnd
+	 * <em>Missing End</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End</em>'.
 	 * @see org.eclipse.acceleo.ErrorQuery#getMissingEnd()
 	 * @see #getErrorQuery()
@@ -4437,9 +4417,9 @@
 	EAttribute getErrorQuery_MissingEnd();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.Expression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.Expression <em>Expression</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Expression</em>'.
 	 * @see org.eclipse.acceleo.Expression
 	 * @generated
@@ -4448,8 +4428,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.Expression#getAst <em>Ast</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Ast</em>'.
 	 * @see org.eclipse.acceleo.Expression#getAst()
 	 * @see #getExpression()
@@ -4458,9 +4438,9 @@
 	EAttribute getExpression_Ast();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Expression#getAql <em>Aql</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Expression#getAql
+	 * <em>Aql</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Aql</em>'.
 	 * @see org.eclipse.acceleo.Expression#getAql()
 	 * @see #getExpression()
@@ -4469,9 +4449,9 @@
 	EReference getExpression_Aql();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorExpression <em>Error Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorExpression <em>Error
+	 * Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Expression</em>'.
 	 * @see org.eclipse.acceleo.ErrorExpression
 	 * @generated
@@ -4479,9 +4459,9 @@
 	EClass getErrorExpression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.Variable <em>Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.Variable <em>Variable</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Variable</em>'.
 	 * @see org.eclipse.acceleo.Variable
 	 * @generated
@@ -4490,8 +4470,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorVariable <em>Error Variable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Variable</em>'.
 	 * @see org.eclipse.acceleo.ErrorVariable
 	 * @generated
@@ -4499,9 +4479,9 @@
 	EClass getErrorVariable();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorVariable#getMissingName <em>Missing Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorVariable#getMissingName
+	 * <em>Missing Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Name</em>'.
 	 * @see org.eclipse.acceleo.ErrorVariable#getMissingName()
 	 * @see #getErrorVariable()
@@ -4510,9 +4490,9 @@
 	EAttribute getErrorVariable_MissingName();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorVariable#getMissingColon <em>Missing Colon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorVariable#getMissingColon
+	 * <em>Missing Colon</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Colon</em>'.
 	 * @see org.eclipse.acceleo.ErrorVariable#getMissingColon()
 	 * @see #getErrorVariable()
@@ -4521,9 +4501,9 @@
 	EAttribute getErrorVariable_MissingColon();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorVariable#getMissingType <em>Missing Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorVariable#getMissingType
+	 * <em>Missing Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Type</em>'.
 	 * @see org.eclipse.acceleo.ErrorVariable#getMissingType()
 	 * @see #getErrorVariable()
@@ -4532,9 +4512,9 @@
 	EAttribute getErrorVariable_MissingType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.Binding <em>Binding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.Binding <em>Binding</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Binding</em>'.
 	 * @see org.eclipse.acceleo.Binding
 	 * @generated
@@ -4542,9 +4522,10 @@
 	EClass getBinding();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.Binding#getInitExpression <em>Init Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.acceleo.Binding#getInitExpression <em>Init Expression</em>}'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Init Expression</em>'.
 	 * @see org.eclipse.acceleo.Binding#getInitExpression()
 	 * @see #getBinding()
@@ -4554,8 +4535,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorBinding <em>Error Binding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Binding</em>'.
 	 * @see org.eclipse.acceleo.ErrorBinding
 	 * @generated
@@ -4563,9 +4544,9 @@
 	EClass getErrorBinding();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorBinding#getMissingName <em>Missing Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorBinding#getMissingName
+	 * <em>Missing Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Name</em>'.
 	 * @see org.eclipse.acceleo.ErrorBinding#getMissingName()
 	 * @see #getErrorBinding()
@@ -4574,9 +4555,9 @@
 	EAttribute getErrorBinding_MissingName();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorBinding#getMissingColon <em>Missing Colon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorBinding#getMissingColon
+	 * <em>Missing Colon</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Colon</em>'.
 	 * @see org.eclipse.acceleo.ErrorBinding#getMissingColon()
 	 * @see #getErrorBinding()
@@ -4585,9 +4566,9 @@
 	EAttribute getErrorBinding_MissingColon();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorBinding#getMissingType <em>Missing Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorBinding#getMissingType
+	 * <em>Missing Type</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Type</em>'.
 	 * @see org.eclipse.acceleo.ErrorBinding#getMissingType()
 	 * @see #getErrorBinding()
@@ -4596,9 +4577,10 @@
 	EAttribute getErrorBinding_MissingType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorBinding#getMissingAffectationSymbole <em>Missing Affectation Symbole</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorBinding#getMissingAffectationSymbole <em>Missing Affectation
+	 * Symbole</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Affectation Symbole</em>'.
 	 * @see org.eclipse.acceleo.ErrorBinding#getMissingAffectationSymbole()
 	 * @see #getErrorBinding()
@@ -4607,9 +4589,10 @@
 	EAttribute getErrorBinding_MissingAffectationSymbole();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorBinding#getMissingAffectationSymbolePosition <em>Missing Affectation Symbole Position</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorBinding#getMissingAffectationSymbolePosition <em>Missing Affectation
+	 * Symbole Position</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Affectation Symbole Position</em>'.
 	 * @see org.eclipse.acceleo.ErrorBinding#getMissingAffectationSymbolePosition()
 	 * @see #getErrorBinding()
@@ -4618,9 +4601,9 @@
 	EAttribute getErrorBinding_MissingAffectationSymbolePosition();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.Statement <em>Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.Statement <em>Statement</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Statement</em>'.
 	 * @see org.eclipse.acceleo.Statement
 	 * @generated
@@ -4629,8 +4612,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.LeafStatement <em>Leaf Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Leaf Statement</em>'.
 	 * @see org.eclipse.acceleo.LeafStatement
 	 * @generated
@@ -4638,9 +4621,9 @@
 	EClass getLeafStatement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.LeafStatement#isNewLineNeeded <em>New Line Needed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.LeafStatement#isNewLineNeeded
+	 * <em>New Line Needed</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>New Line Needed</em>'.
 	 * @see org.eclipse.acceleo.LeafStatement#isNewLineNeeded()
 	 * @see #getLeafStatement()
@@ -4649,9 +4632,9 @@
 	EAttribute getLeafStatement_NewLineNeeded();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ExpressionStatement <em>Expression Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ExpressionStatement <em>Expression
+	 * Statement</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Expression Statement</em>'.
 	 * @see org.eclipse.acceleo.ExpressionStatement
 	 * @generated
@@ -4659,9 +4642,10 @@
 	EClass getExpressionStatement();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.ExpressionStatement#getExpression <em>Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.acceleo.ExpressionStatement#getExpression <em>Expression</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Expression</em>'.
 	 * @see org.eclipse.acceleo.ExpressionStatement#getExpression()
 	 * @see #getExpressionStatement()
@@ -4670,9 +4654,9 @@
 	EReference getExpressionStatement_Expression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorExpressionStatement <em>Error Expression Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorExpressionStatement <em>Error
+	 * Expression Statement</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Expression Statement</em>'.
 	 * @see org.eclipse.acceleo.ErrorExpressionStatement
 	 * @generated
@@ -4680,9 +4664,10 @@
 	EClass getErrorExpressionStatement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorExpressionStatement#getMissingEndHeader <em>Missing End Header</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorExpressionStatement#getMissingEndHeader <em>Missing End Header</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End Header</em>'.
 	 * @see org.eclipse.acceleo.ErrorExpressionStatement#getMissingEndHeader()
 	 * @see #getErrorExpressionStatement()
@@ -4692,8 +4677,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.ProtectedArea <em>Protected Area</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Protected Area</em>'.
 	 * @see org.eclipse.acceleo.ProtectedArea
 	 * @generated
@@ -4701,9 +4686,9 @@
 	EClass getProtectedArea();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.ProtectedArea#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.ProtectedArea#getId
+	 * <em>Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Id</em>'.
 	 * @see org.eclipse.acceleo.ProtectedArea#getId()
 	 * @see #getProtectedArea()
@@ -4712,9 +4697,9 @@
 	EReference getProtectedArea_Id();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.ProtectedArea#getBody <em>Body</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.ProtectedArea#getBody
+	 * <em>Body</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Body</em>'.
 	 * @see org.eclipse.acceleo.ProtectedArea#getBody()
 	 * @see #getProtectedArea()
@@ -4723,9 +4708,9 @@
 	EReference getProtectedArea_Body();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorProtectedArea <em>Error Protected Area</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorProtectedArea <em>Error Protected
+	 * Area</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Protected Area</em>'.
 	 * @see org.eclipse.acceleo.ErrorProtectedArea
 	 * @generated
@@ -4733,9 +4718,10 @@
 	EClass getErrorProtectedArea();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingOpenParenthesis <em>Missing Open
+	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Open Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorProtectedArea#getMissingOpenParenthesis()
 	 * @see #getErrorProtectedArea()
@@ -4744,9 +4730,10 @@
 	EAttribute getErrorProtectedArea_MissingOpenParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingCloseParenthesis <em>Missing Close
+	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Close Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorProtectedArea#getMissingCloseParenthesis()
 	 * @see #getErrorProtectedArea()
@@ -4755,9 +4742,10 @@
 	EAttribute getErrorProtectedArea_MissingCloseParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingEndHeader <em>Missing End Header</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingEndHeader <em>Missing End Header</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End Header</em>'.
 	 * @see org.eclipse.acceleo.ErrorProtectedArea#getMissingEndHeader()
 	 * @see #getErrorProtectedArea()
@@ -4766,9 +4754,9 @@
 	EAttribute getErrorProtectedArea_MissingEndHeader();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingEnd <em>Missing End</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingEnd
+	 * <em>Missing End</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End</em>'.
 	 * @see org.eclipse.acceleo.ErrorProtectedArea#getMissingEnd()
 	 * @see #getErrorProtectedArea()
@@ -4778,8 +4766,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.ForStatement <em>For Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>For Statement</em>'.
 	 * @see org.eclipse.acceleo.ForStatement
 	 * @generated
@@ -4787,9 +4775,10 @@
 	EClass getForStatement();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.ForStatement#getBinding <em>Binding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.acceleo.ForStatement#getBinding <em>Binding</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Binding</em>'.
 	 * @see org.eclipse.acceleo.ForStatement#getBinding()
 	 * @see #getForStatement()
@@ -4798,9 +4787,10 @@
 	EReference getForStatement_Binding();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.ForStatement#getSeparator <em>Separator</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.acceleo.ForStatement#getSeparator <em>Separator</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Separator</em>'.
 	 * @see org.eclipse.acceleo.ForStatement#getSeparator()
 	 * @see #getForStatement()
@@ -4809,9 +4799,9 @@
 	EReference getForStatement_Separator();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.ForStatement#getBody <em>Body</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.ForStatement#getBody
+	 * <em>Body</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Body</em>'.
 	 * @see org.eclipse.acceleo.ForStatement#getBody()
 	 * @see #getForStatement()
@@ -4820,9 +4810,9 @@
 	EReference getForStatement_Body();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorForStatement <em>Error For Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorForStatement <em>Error For
+	 * Statement</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error For Statement</em>'.
 	 * @see org.eclipse.acceleo.ErrorForStatement
 	 * @generated
@@ -4830,9 +4820,10 @@
 	EClass getErrorForStatement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorForStatement#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorForStatement#getMissingOpenParenthesis <em>Missing Open
+	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Open Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorForStatement#getMissingOpenParenthesis()
 	 * @see #getErrorForStatement()
@@ -4841,9 +4832,10 @@
 	EAttribute getErrorForStatement_MissingOpenParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorForStatement#getMissingBinding <em>Missing Binding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorForStatement#getMissingBinding <em>Missing Binding</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Binding</em>'.
 	 * @see org.eclipse.acceleo.ErrorForStatement#getMissingBinding()
 	 * @see #getErrorForStatement()
@@ -4852,9 +4844,10 @@
 	EAttribute getErrorForStatement_MissingBinding();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorForStatement#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorForStatement#getMissingCloseParenthesis <em>Missing Close
+	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Close Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorForStatement#getMissingCloseParenthesis()
 	 * @see #getErrorForStatement()
@@ -4863,9 +4856,10 @@
 	EAttribute getErrorForStatement_MissingCloseParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorForStatement#getMissingSeparatorCloseParenthesis <em>Missing Separator Close Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorForStatement#getMissingSeparatorCloseParenthesis <em>Missing Separator
+	 * Close Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Separator Close Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorForStatement#getMissingSeparatorCloseParenthesis()
 	 * @see #getErrorForStatement()
@@ -4874,9 +4868,10 @@
 	EAttribute getErrorForStatement_MissingSeparatorCloseParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorForStatement#getMissingEndHeader <em>Missing End Header</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorForStatement#getMissingEndHeader <em>Missing End Header</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End Header</em>'.
 	 * @see org.eclipse.acceleo.ErrorForStatement#getMissingEndHeader()
 	 * @see #getErrorForStatement()
@@ -4885,9 +4880,9 @@
 	EAttribute getErrorForStatement_MissingEndHeader();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorForStatement#getMissingEnd <em>Missing End</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorForStatement#getMissingEnd
+	 * <em>Missing End</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End</em>'.
 	 * @see org.eclipse.acceleo.ErrorForStatement#getMissingEnd()
 	 * @see #getErrorForStatement()
@@ -4896,9 +4891,9 @@
 	EAttribute getErrorForStatement_MissingEnd();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.IfStatement <em>If Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.IfStatement <em>If Statement</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>If Statement</em>'.
 	 * @see org.eclipse.acceleo.IfStatement
 	 * @generated
@@ -4906,9 +4901,10 @@
 	EClass getIfStatement();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.IfStatement#getCondition <em>Condition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.acceleo.IfStatement#getCondition <em>Condition</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Condition</em>'.
 	 * @see org.eclipse.acceleo.IfStatement#getCondition()
 	 * @see #getIfStatement()
@@ -4917,9 +4913,9 @@
 	EReference getIfStatement_Condition();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.IfStatement#getThen <em>Then</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.IfStatement#getThen
+	 * <em>Then</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Then</em>'.
 	 * @see org.eclipse.acceleo.IfStatement#getThen()
 	 * @see #getIfStatement()
@@ -4928,9 +4924,9 @@
 	EReference getIfStatement_Then();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.IfStatement#getElse <em>Else</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.IfStatement#getElse
+	 * <em>Else</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Else</em>'.
 	 * @see org.eclipse.acceleo.IfStatement#getElse()
 	 * @see #getIfStatement()
@@ -4939,9 +4935,9 @@
 	EReference getIfStatement_Else();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorIfStatement <em>Error If Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorIfStatement <em>Error If
+	 * Statement</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error If Statement</em>'.
 	 * @see org.eclipse.acceleo.ErrorIfStatement
 	 * @generated
@@ -4949,9 +4945,10 @@
 	EClass getErrorIfStatement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingOpenParenthesis <em>Missing Open
+	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Open Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorIfStatement#getMissingOpenParenthesis()
 	 * @see #getErrorIfStatement()
@@ -4960,9 +4957,10 @@
 	EAttribute getErrorIfStatement_MissingOpenParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingCloseParenthesis <em>Missing Close
+	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Close Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorIfStatement#getMissingCloseParenthesis()
 	 * @see #getErrorIfStatement()
@@ -4971,9 +4969,10 @@
 	EAttribute getErrorIfStatement_MissingCloseParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingEndHeader <em>Missing End Header</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingEndHeader <em>Missing End Header</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End Header</em>'.
 	 * @see org.eclipse.acceleo.ErrorIfStatement#getMissingEndHeader()
 	 * @see #getErrorIfStatement()
@@ -4982,9 +4981,9 @@
 	EAttribute getErrorIfStatement_MissingEndHeader();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingEnd <em>Missing End</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingEnd
+	 * <em>Missing End</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End</em>'.
 	 * @see org.eclipse.acceleo.ErrorIfStatement#getMissingEnd()
 	 * @see #getErrorIfStatement()
@@ -4994,8 +4993,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.LetStatement <em>Let Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Let Statement</em>'.
 	 * @see org.eclipse.acceleo.LetStatement
 	 * @generated
@@ -5003,9 +5002,10 @@
 	EClass getLetStatement();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.acceleo.LetStatement#getVariables <em>Variables</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.acceleo.LetStatement#getVariables <em>Variables</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Variables</em>'.
 	 * @see org.eclipse.acceleo.LetStatement#getVariables()
 	 * @see #getLetStatement()
@@ -5014,9 +5014,9 @@
 	EReference getLetStatement_Variables();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.LetStatement#getBody <em>Body</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.LetStatement#getBody
+	 * <em>Body</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Body</em>'.
 	 * @see org.eclipse.acceleo.LetStatement#getBody()
 	 * @see #getLetStatement()
@@ -5025,9 +5025,9 @@
 	EReference getLetStatement_Body();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorLetStatement <em>Error Let Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorLetStatement <em>Error Let
+	 * Statement</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error Let Statement</em>'.
 	 * @see org.eclipse.acceleo.ErrorLetStatement
 	 * @generated
@@ -5035,9 +5035,10 @@
 	EClass getErrorLetStatement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorLetStatement#getMissingBindings <em>Missing Bindings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorLetStatement#getMissingBindings <em>Missing Bindings</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Bindings</em>'.
 	 * @see org.eclipse.acceleo.ErrorLetStatement#getMissingBindings()
 	 * @see #getErrorLetStatement()
@@ -5046,9 +5047,10 @@
 	EAttribute getErrorLetStatement_MissingBindings();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorLetStatement#getMissingEndHeader <em>Missing End Header</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorLetStatement#getMissingEndHeader <em>Missing End Header</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End Header</em>'.
 	 * @see org.eclipse.acceleo.ErrorLetStatement#getMissingEndHeader()
 	 * @see #getErrorLetStatement()
@@ -5057,9 +5059,9 @@
 	EAttribute getErrorLetStatement_MissingEndHeader();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorLetStatement#getMissingEnd <em>Missing End</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorLetStatement#getMissingEnd
+	 * <em>Missing End</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End</em>'.
 	 * @see org.eclipse.acceleo.ErrorLetStatement#getMissingEnd()
 	 * @see #getErrorLetStatement()
@@ -5069,8 +5071,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.FileStatement <em>File Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>File Statement</em>'.
 	 * @see org.eclipse.acceleo.FileStatement
 	 * @generated
@@ -5078,9 +5080,9 @@
 	EClass getFileStatement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.FileStatement#getMode <em>Mode</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.FileStatement#getMode
+	 * <em>Mode</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Mode</em>'.
 	 * @see org.eclipse.acceleo.FileStatement#getMode()
 	 * @see #getFileStatement()
@@ -5089,9 +5091,9 @@
 	EAttribute getFileStatement_Mode();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.FileStatement#getUrl <em>Url</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.FileStatement#getUrl
+	 * <em>Url</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Url</em>'.
 	 * @see org.eclipse.acceleo.FileStatement#getUrl()
 	 * @see #getFileStatement()
@@ -5100,9 +5102,10 @@
 	EReference getFileStatement_Url();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.FileStatement#getCharset <em>Charset</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.acceleo.FileStatement#getCharset <em>Charset</em>}'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Charset</em>'.
 	 * @see org.eclipse.acceleo.FileStatement#getCharset()
 	 * @see #getFileStatement()
@@ -5111,9 +5114,9 @@
 	EReference getFileStatement_Charset();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.FileStatement#getBody <em>Body</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.FileStatement#getBody
+	 * <em>Body</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Body</em>'.
 	 * @see org.eclipse.acceleo.FileStatement#getBody()
 	 * @see #getFileStatement()
@@ -5122,9 +5125,9 @@
 	EReference getFileStatement_Body();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorFileStatement <em>Error File Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.ErrorFileStatement <em>Error File
+	 * Statement</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Error File Statement</em>'.
 	 * @see org.eclipse.acceleo.ErrorFileStatement
 	 * @generated
@@ -5132,9 +5135,10 @@
 	EClass getErrorFileStatement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingOpenParenthesis <em>Missing Open
+	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Open Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorFileStatement#getMissingOpenParenthesis()
 	 * @see #getErrorFileStatement()
@@ -5143,9 +5147,10 @@
 	EAttribute getErrorFileStatement_MissingOpenParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingComma <em>Missing Comma</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingComma <em>Missing Comma</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Comma</em>'.
 	 * @see org.eclipse.acceleo.ErrorFileStatement#getMissingComma()
 	 * @see #getErrorFileStatement()
@@ -5154,9 +5159,10 @@
 	EAttribute getErrorFileStatement_MissingComma();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingOpenMode <em>Missing Open Mode</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingOpenMode <em>Missing Open Mode</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Open Mode</em>'.
 	 * @see org.eclipse.acceleo.ErrorFileStatement#getMissingOpenMode()
 	 * @see #getErrorFileStatement()
@@ -5165,9 +5171,10 @@
 	EAttribute getErrorFileStatement_MissingOpenMode();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingCloseParenthesis <em>Missing Close
+	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing Close Parenthesis</em>'.
 	 * @see org.eclipse.acceleo.ErrorFileStatement#getMissingCloseParenthesis()
 	 * @see #getErrorFileStatement()
@@ -5176,9 +5183,10 @@
 	EAttribute getErrorFileStatement_MissingCloseParenthesis();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingEndHeader <em>Missing End Header</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingEndHeader <em>Missing End Header</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End Header</em>'.
 	 * @see org.eclipse.acceleo.ErrorFileStatement#getMissingEndHeader()
 	 * @see #getErrorFileStatement()
@@ -5187,9 +5195,9 @@
 	EAttribute getErrorFileStatement_MissingEndHeader();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingEnd <em>Missing End</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingEnd
+	 * <em>Missing End</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Missing End</em>'.
 	 * @see org.eclipse.acceleo.ErrorFileStatement#getMissingEnd()
 	 * @see #getErrorFileStatement()
@@ -5199,8 +5207,8 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.TextStatement <em>Text Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Text Statement</em>'.
 	 * @see org.eclipse.acceleo.TextStatement
 	 * @generated
@@ -5208,9 +5216,9 @@
 	EClass getTextStatement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.TextStatement#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.TextStatement#getValue
+	 * <em>Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.acceleo.TextStatement#getValue()
 	 * @see #getTextStatement()
@@ -5219,9 +5227,9 @@
 	EAttribute getTextStatement_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.NewLineStatement <em>New Line Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.NewLineStatement <em>New Line
+	 * Statement</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>New Line Statement</em>'.
 	 * @see org.eclipse.acceleo.NewLineStatement
 	 * @generated
@@ -5229,9 +5237,10 @@
 	EClass getNewLineStatement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.NewLineStatement#isIndentationNeeded <em>Indentation Needed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.NewLineStatement#isIndentationNeeded <em>Indentation Needed</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Indentation Needed</em>'.
 	 * @see org.eclipse.acceleo.NewLineStatement#isIndentationNeeded()
 	 * @see #getNewLineStatement()
@@ -5241,8 +5250,8 @@
 
 	/**
 	 * Returns the meta object for enum '{@link org.eclipse.acceleo.VisibilityKind <em>Visibility Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Visibility Kind</em>'.
 	 * @see org.eclipse.acceleo.VisibilityKind
 	 * @generated
@@ -5251,8 +5260,8 @@
 
 	/**
 	 * Returns the meta object for enum '{@link org.eclipse.acceleo.OpenModeKind <em>Open Mode Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Open Mode Kind</em>'.
 	 * @see org.eclipse.acceleo.OpenModeKind
 	 * @generated
@@ -5260,9 +5269,9 @@
 	EEnum getOpenModeKind();
 
 	/**
-	 * Returns the meta object for data type '{@link org.eclipse.acceleo.query.parser.AstResult <em>AST Result</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link org.eclipse.acceleo.query.parser.AstResult <em>AST
+	 * Result</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>AST Result</em>'.
 	 * @see org.eclipse.acceleo.query.parser.AstResult
 	 * @model instanceClass="org.eclipse.acceleo.query.parser.AstResult"
@@ -5271,9 +5280,9 @@
 	EDataType getASTResult();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String <em>Module Qualified Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link java.lang.String <em>Module Qualified Name</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Module Qualified Name</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -5282,9 +5291,9 @@
 	EDataType getModuleQualifiedName();
 
 	/**
-	 * Returns the meta object for data type '{@link org.eclipse.acceleo.aql.parser.AcceleoAstResult <em>Ast Result</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for data type '{@link org.eclipse.acceleo.aql.parser.AcceleoAstResult <em>Ast
+	 * Result</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Ast Result</em>'.
 	 * @see org.eclipse.acceleo.aql.parser.AcceleoAstResult
 	 * @model instanceClass="org.eclipse.acceleo.aql.parser.AcceleoAstResult"
@@ -5293,32 +5302,32 @@
 	EDataType getAcceleoAstResult();
 
 	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
 	AcceleoFactory getAcceleoFactory();
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
+	 * <!-- begin-user-doc --> Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ModuleImpl <em>Module</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ModuleImpl <em>Module</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ModuleImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getModule()
 		 * @generated
@@ -5326,65 +5335,65 @@
 		EClass MODULE = eINSTANCE.getModule();
 
 		/**
-		 * The meta object literal for the '<em><b>Metamodels</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Metamodels</b></em>' reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MODULE__METAMODELS = eINSTANCE.getModule_Metamodels();
 
 		/**
-		 * The meta object literal for the '<em><b>Extends</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Extends</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MODULE__EXTENDS = eINSTANCE.getModule_Extends();
 
 		/**
-		 * The meta object literal for the '<em><b>Imports</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Imports</b></em>' containment reference list feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MODULE__IMPORTS = eINSTANCE.getModule_Imports();
 
 		/**
-		 * The meta object literal for the '<em><b>Module Elements</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Module Elements</b></em>' containment reference list
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MODULE__MODULE_ELEMENTS = eINSTANCE.getModule_ModuleElements();
 
 		/**
-		 * The meta object literal for the '<em><b>Start Header Position</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Start Header Position</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute MODULE__START_HEADER_POSITION = eINSTANCE.getModule_StartHeaderPosition();
 
 		/**
-		 * The meta object literal for the '<em><b>End Header Position</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>End Header Position</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute MODULE__END_HEADER_POSITION = eINSTANCE.getModule_EndHeaderPosition();
 
 		/**
-		 * The meta object literal for the '<em><b>Ast</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Ast</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute MODULE__AST = eINSTANCE.getModule_Ast();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorModuleImpl <em>Error Module</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorModuleImpl <em>Error
+		 * Module</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorModuleImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorModule()
 		 * @generated
@@ -5392,42 +5401,42 @@
 		EClass ERROR_MODULE = eINSTANCE.getErrorModule();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Open Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Open Parenthesis</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_MODULE__MISSING_OPEN_PARENTHESIS = eINSTANCE.getErrorModule_MissingOpenParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing EPackage</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing EPackage</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_MODULE__MISSING_EPACKAGE = eINSTANCE.getErrorModule_MissingEPackage();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Close Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Close Parenthesis</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_MODULE__MISSING_CLOSE_PARENTHESIS = eINSTANCE
 				.getErrorModule_MissingCloseParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_MODULE__MISSING_END_HEADER = eINSTANCE.getErrorModule_MissingEndHeader();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.MetamodelImpl <em>Metamodel</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.MetamodelImpl <em>Metamodel</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.MetamodelImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getMetamodel()
 		 * @generated
@@ -5435,17 +5444,17 @@
 		EClass METAMODEL = eINSTANCE.getMetamodel();
 
 		/**
-		 * The meta object literal for the '<em><b>Referenced Package</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Referenced Package</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference METAMODEL__REFERENCED_PACKAGE = eINSTANCE.getMetamodel_ReferencedPackage();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorMetamodelImpl <em>Error Metamodel</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorMetamodelImpl <em>Error
+		 * Metamodel</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorMetamodelImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorMetamodel()
 		 * @generated
@@ -5453,25 +5462,25 @@
 		EClass ERROR_METAMODEL = eINSTANCE.getErrorMetamodel();
 
 		/**
-		 * The meta object literal for the '<em><b>Fragment</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Fragment</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_METAMODEL__FRAGMENT = eINSTANCE.getErrorMetamodel_Fragment();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End Quote</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End Quote</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_METAMODEL__MISSING_END_QUOTE = eINSTANCE.getErrorMetamodel_MissingEndQuote();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ImportImpl <em>Import</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ImportImpl <em>Import</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ImportImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getImport()
 		 * @generated
@@ -5479,17 +5488,17 @@
 		EClass IMPORT = eINSTANCE.getImport();
 
 		/**
-		 * The meta object literal for the '<em><b>Module</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Module</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference IMPORT__MODULE = eINSTANCE.getImport_Module();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorImportImpl <em>Error Import</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorImportImpl <em>Error
+		 * Import</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorImportImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorImport()
 		 * @generated
@@ -5497,17 +5506,17 @@
 		EClass ERROR_IMPORT = eINSTANCE.getErrorImport();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_IMPORT__MISSING_END = eINSTANCE.getErrorImport_MissingEnd();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ModuleReferenceImpl <em>Module Reference</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ModuleReferenceImpl <em>Module
+		 * Reference</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ModuleReferenceImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getModuleReference()
 		 * @generated
@@ -5515,17 +5524,17 @@
 		EClass MODULE_REFERENCE = eINSTANCE.getModuleReference();
 
 		/**
-		 * The meta object literal for the '<em><b>Qualified Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Qualified Name</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute MODULE_REFERENCE__QUALIFIED_NAME = eINSTANCE.getModuleReference_QualifiedName();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorModuleReferenceImpl <em>Error Module Reference</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorModuleReferenceImpl <em>Error
+		 * Module Reference</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorModuleReferenceImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorModuleReference()
 		 * @generated
@@ -5533,9 +5542,9 @@
 		EClass ERROR_MODULE_REFERENCE = eINSTANCE.getErrorModuleReference();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ModuleElementImpl <em>Module Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ModuleElementImpl <em>Module
+		 * Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ModuleElementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getModuleElement()
 		 * @generated
@@ -5543,9 +5552,9 @@
 		EClass MODULE_ELEMENT = eINSTANCE.getModuleElement();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.CommentImpl <em>Comment</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.CommentImpl <em>Comment</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.CommentImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getComment()
 		 * @generated
@@ -5553,17 +5562,17 @@
 		EClass COMMENT = eINSTANCE.getComment();
 
 		/**
-		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference COMMENT__BODY = eINSTANCE.getComment_Body();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.BlockCommentImpl <em>Block Comment</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.BlockCommentImpl <em>Block
+		 * Comment</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.BlockCommentImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getBlockComment()
 		 * @generated
@@ -5571,9 +5580,9 @@
 		EClass BLOCK_COMMENT = eINSTANCE.getBlockComment();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorBlockCommentImpl <em>Error Block Comment</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorBlockCommentImpl <em>Error
+		 * Block Comment</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorBlockCommentImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorBlockComment()
 		 * @generated
@@ -5581,9 +5590,9 @@
 		EClass ERROR_BLOCK_COMMENT = eINSTANCE.getErrorBlockComment();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorCommentImpl <em>Error Comment</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorCommentImpl <em>Error
+		 * Comment</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorCommentImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorComment()
 		 * @generated
@@ -5591,17 +5600,17 @@
 		EClass ERROR_COMMENT = eINSTANCE.getErrorComment();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_COMMENT__MISSING_END_HEADER = eINSTANCE.getErrorComment_MissingEndHeader();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.CommentBodyImpl <em>Comment Body</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.CommentBodyImpl <em>Comment
+		 * Body</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.CommentBodyImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getCommentBody()
 		 * @generated
@@ -5609,17 +5618,17 @@
 		EClass COMMENT_BODY = eINSTANCE.getCommentBody();
 
 		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute COMMENT_BODY__VALUE = eINSTANCE.getCommentBody_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.Documentation <em>Documentation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.Documentation <em>Documentation</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.Documentation
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getDocumentation()
 		 * @generated
@@ -5627,17 +5636,17 @@
 		EClass DOCUMENTATION = eINSTANCE.getDocumentation();
 
 		/**
-		 * The meta object literal for the '<em><b>Documented Element</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Documented Element</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DOCUMENTATION__DOCUMENTED_ELEMENT = eINSTANCE.getDocumentation_DocumentedElement();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ModuleDocumentationImpl <em>Module Documentation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ModuleDocumentationImpl <em>Module
+		 * Documentation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ModuleDocumentationImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getModuleDocumentation()
 		 * @generated
@@ -5645,33 +5654,33 @@
 		EClass MODULE_DOCUMENTATION = eINSTANCE.getModuleDocumentation();
 
 		/**
-		 * The meta object literal for the '<em><b>Author</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Author</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute MODULE_DOCUMENTATION__AUTHOR = eINSTANCE.getModuleDocumentation_Author();
 
 		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute MODULE_DOCUMENTATION__VERSION = eINSTANCE.getModuleDocumentation_Version();
 
 		/**
-		 * The meta object literal for the '<em><b>Since</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Since</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute MODULE_DOCUMENTATION__SINCE = eINSTANCE.getModuleDocumentation_Since();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl <em>Error Module Documentation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl
+		 * <em>Error Module Documentation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorModuleDocumentation()
 		 * @generated
@@ -5679,18 +5688,18 @@
 		EClass ERROR_MODULE_DOCUMENTATION = eINSTANCE.getErrorModuleDocumentation();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_MODULE_DOCUMENTATION__MISSING_END_HEADER = eINSTANCE
 				.getErrorModuleDocumentation_MissingEndHeader();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ModuleElementDocumentationImpl <em>Module Element Documentation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ModuleElementDocumentationImpl
+		 * <em>Module Element Documentation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ModuleElementDocumentationImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getModuleElementDocumentation()
 		 * @generated
@@ -5698,18 +5707,19 @@
 		EClass MODULE_ELEMENT_DOCUMENTATION = eINSTANCE.getModuleElementDocumentation();
 
 		/**
-		 * The meta object literal for the '<em><b>Parameter Documentation</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Parameter Documentation</b></em>' containment reference
+		 * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MODULE_ELEMENT_DOCUMENTATION__PARAMETER_DOCUMENTATION = eINSTANCE
 				.getModuleElementDocumentation_ParameterDocumentation();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorModuleElementDocumentationImpl <em>Error Module Element Documentation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the
+		 * '{@link org.eclipse.acceleo.impl.ErrorModuleElementDocumentationImpl <em>Error Module Element
+		 * Documentation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorModuleElementDocumentationImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorModuleElementDocumentation()
 		 * @generated
@@ -5717,18 +5727,18 @@
 		EClass ERROR_MODULE_ELEMENT_DOCUMENTATION = eINSTANCE.getErrorModuleElementDocumentation();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_MODULE_ELEMENT_DOCUMENTATION__MISSING_END_HEADER = eINSTANCE
 				.getErrorModuleElementDocumentation_MissingEndHeader();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ParameterDocumentationImpl <em>Parameter Documentation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ParameterDocumentationImpl
+		 * <em>Parameter Documentation</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ParameterDocumentationImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getParameterDocumentation()
 		 * @generated
@@ -5736,9 +5746,9 @@
 		EClass PARAMETER_DOCUMENTATION = eINSTANCE.getParameterDocumentation();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.DocumentedElement <em>Documented Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.DocumentedElement <em>Documented
+		 * Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.DocumentedElement
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getDocumentedElement()
 		 * @generated
@@ -5746,25 +5756,25 @@
 		EClass DOCUMENTED_ELEMENT = eINSTANCE.getDocumentedElement();
 
 		/**
-		 * The meta object literal for the '<em><b>Documentation</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Documentation</b></em>' reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DOCUMENTED_ELEMENT__DOCUMENTATION = eINSTANCE.getDocumentedElement_Documentation();
 
 		/**
-		 * The meta object literal for the '<em><b>Deprecated</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Deprecated</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DOCUMENTED_ELEMENT__DEPRECATED = eINSTANCE.getDocumentedElement_Deprecated();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.NamedElementImpl <em>Named Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.NamedElementImpl <em>Named
+		 * Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.NamedElementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getNamedElement()
 		 * @generated
@@ -5772,17 +5782,17 @@
 		EClass NAMED_ELEMENT = eINSTANCE.getNamedElement();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute NAMED_ELEMENT__NAME = eINSTANCE.getNamedElement_Name();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.ASTNode <em>AST Node</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.ASTNode <em>AST Node</em>}' class. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.ASTNode
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getASTNode()
 		 * @generated
@@ -5790,9 +5800,9 @@
 		EClass AST_NODE = eINSTANCE.getASTNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.Error <em>Error</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.Error <em>Error</em>}' class. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.Error
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getError()
 		 * @generated
@@ -5801,8 +5811,8 @@
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.BlockImpl <em>Block</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.BlockImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getBlock()
 		 * @generated
@@ -5811,24 +5821,24 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Statements</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference BLOCK__STATEMENTS = eINSTANCE.getBlock_Statements();
 
 		/**
-		 * The meta object literal for the '<em><b>Inlined</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Inlined</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute BLOCK__INLINED = eINSTANCE.getBlock_Inlined();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.TypedElementImpl <em>Typed Element</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.TypedElementImpl <em>Typed
+		 * Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.TypedElementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getTypedElement()
 		 * @generated
@@ -5836,25 +5846,25 @@
 		EClass TYPED_ELEMENT = eINSTANCE.getTypedElement();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TYPED_ELEMENT__TYPE = eINSTANCE.getTypedElement_Type();
 
 		/**
-		 * The meta object literal for the '<em><b>Type Aql</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Type Aql</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TYPED_ELEMENT__TYPE_AQL = eINSTANCE.getTypedElement_TypeAql();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.TemplateImpl <em>Template</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.TemplateImpl <em>Template</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.TemplateImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getTemplate()
 		 * @generated
@@ -5863,56 +5873,56 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TEMPLATE__PARAMETERS = eINSTANCE.getTemplate_Parameters();
 
 		/**
-		 * The meta object literal for the '<em><b>Guard</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Guard</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TEMPLATE__GUARD = eINSTANCE.getTemplate_Guard();
 
 		/**
-		 * The meta object literal for the '<em><b>Post</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Post</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TEMPLATE__POST = eINSTANCE.getTemplate_Post();
 
 		/**
-		 * The meta object literal for the '<em><b>Main</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Main</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TEMPLATE__MAIN = eINSTANCE.getTemplate_Main();
 
 		/**
-		 * The meta object literal for the '<em><b>Visibility</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Visibility</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TEMPLATE__VISIBILITY = eINSTANCE.getTemplate_Visibility();
 
 		/**
-		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TEMPLATE__BODY = eINSTANCE.getTemplate_Body();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorTemplateImpl <em>Error Template</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorTemplateImpl <em>Error
+		 * Template</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorTemplateImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorTemplate()
 		 * @generated
@@ -5920,42 +5930,42 @@
 		EClass ERROR_TEMPLATE = eINSTANCE.getErrorTemplate();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Visibility</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Visibility</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_TEMPLATE__MISSING_VISIBILITY = eINSTANCE.getErrorTemplate_MissingVisibility();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Name</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_TEMPLATE__MISSING_NAME = eINSTANCE.getErrorTemplate_MissingName();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Open Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Open Parenthesis</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_TEMPLATE__MISSING_OPEN_PARENTHESIS = eINSTANCE
 				.getErrorTemplate_MissingOpenParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Parameters</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Parameters</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_TEMPLATE__MISSING_PARAMETERS = eINSTANCE.getErrorTemplate_MissingParameters();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Close Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Close Parenthesis</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_TEMPLATE__MISSING_CLOSE_PARENTHESIS = eINSTANCE
@@ -5963,17 +5973,17 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Missing Guard Open Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_TEMPLATE__MISSING_GUARD_OPEN_PARENTHESIS = eINSTANCE
 				.getErrorTemplate_MissingGuardOpenParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Guard Close Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Guard Close Parenthesis</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_TEMPLATE__MISSING_GUARD_CLOSE_PARENTHESIS = eINSTANCE
@@ -5981,33 +5991,33 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Missing Post Close Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_TEMPLATE__MISSING_POST_CLOSE_PARENTHESIS = eINSTANCE
 				.getErrorTemplate_MissingPostCloseParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_TEMPLATE__MISSING_END_HEADER = eINSTANCE.getErrorTemplate_MissingEndHeader();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_TEMPLATE__MISSING_END = eINSTANCE.getErrorTemplate_MissingEnd();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.QueryImpl <em>Query</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.QueryImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getQuery()
 		 * @generated
@@ -6016,32 +6026,32 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference QUERY__PARAMETERS = eINSTANCE.getQuery_Parameters();
 
 		/**
-		 * The meta object literal for the '<em><b>Visibility</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Visibility</b></em>' attribute feature. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute QUERY__VISIBILITY = eINSTANCE.getQuery_Visibility();
 
 		/**
-		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference QUERY__BODY = eINSTANCE.getQuery_Body();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorQueryImpl <em>Error Query</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorQueryImpl <em>Error
+		 * Query</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorQueryImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorQuery()
 		 * @generated
@@ -6049,81 +6059,81 @@
 		EClass ERROR_QUERY = eINSTANCE.getErrorQuery();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Visibility</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Visibility</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_QUERY__MISSING_VISIBILITY = eINSTANCE.getErrorQuery_MissingVisibility();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Name</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_QUERY__MISSING_NAME = eINSTANCE.getErrorQuery_MissingName();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Open Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Open Parenthesis</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_QUERY__MISSING_OPEN_PARENTHESIS = eINSTANCE.getErrorQuery_MissingOpenParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Parameters</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Parameters</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_QUERY__MISSING_PARAMETERS = eINSTANCE.getErrorQuery_MissingParameters();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Close Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Close Parenthesis</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_QUERY__MISSING_CLOSE_PARENTHESIS = eINSTANCE.getErrorQuery_MissingCloseParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Colon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Colon</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_QUERY__MISSING_COLON = eINSTANCE.getErrorQuery_MissingColon();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Type</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_QUERY__MISSING_TYPE = eINSTANCE.getErrorQuery_MissingType();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Equal</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Equal</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_QUERY__MISSING_EQUAL = eINSTANCE.getErrorQuery_MissingEqual();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_QUERY__MISSING_END = eINSTANCE.getErrorQuery_MissingEnd();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ExpressionImpl <em>Expression</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ExpressionImpl
+		 * <em>Expression</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ExpressionImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getExpression()
 		 * @generated
@@ -6131,25 +6141,25 @@
 		EClass EXPRESSION = eINSTANCE.getExpression();
 
 		/**
-		 * The meta object literal for the '<em><b>Ast</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Ast</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute EXPRESSION__AST = eINSTANCE.getExpression_Ast();
 
 		/**
-		 * The meta object literal for the '<em><b>Aql</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Aql</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EXPRESSION__AQL = eINSTANCE.getExpression_Aql();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorExpressionImpl <em>Error Expression</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorExpressionImpl <em>Error
+		 * Expression</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorExpressionImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorExpression()
 		 * @generated
@@ -6157,9 +6167,9 @@
 		EClass ERROR_EXPRESSION = eINSTANCE.getErrorExpression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.VariableImpl <em>Variable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.VariableImpl <em>Variable</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.VariableImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getVariable()
 		 * @generated
@@ -6167,9 +6177,9 @@
 		EClass VARIABLE = eINSTANCE.getVariable();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorVariableImpl <em>Error Variable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorVariableImpl <em>Error
+		 * Variable</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorVariableImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorVariable()
 		 * @generated
@@ -6177,33 +6187,33 @@
 		EClass ERROR_VARIABLE = eINSTANCE.getErrorVariable();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Name</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_VARIABLE__MISSING_NAME = eINSTANCE.getErrorVariable_MissingName();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Colon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Colon</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_VARIABLE__MISSING_COLON = eINSTANCE.getErrorVariable_MissingColon();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Type</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_VARIABLE__MISSING_TYPE = eINSTANCE.getErrorVariable_MissingType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.BindingImpl <em>Binding</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.BindingImpl <em>Binding</em>}'
+		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.BindingImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getBinding()
 		 * @generated
@@ -6212,16 +6222,16 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Init Expression</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference BINDING__INIT_EXPRESSION = eINSTANCE.getBinding_InitExpression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorBindingImpl <em>Error Binding</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorBindingImpl <em>Error
+		 * Binding</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorBindingImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorBinding()
 		 * @generated
@@ -6229,42 +6239,42 @@
 		EClass ERROR_BINDING = eINSTANCE.getErrorBinding();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Name</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_BINDING__MISSING_NAME = eINSTANCE.getErrorBinding_MissingName();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Colon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Colon</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_BINDING__MISSING_COLON = eINSTANCE.getErrorBinding_MissingColon();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Type</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_BINDING__MISSING_TYPE = eINSTANCE.getErrorBinding_MissingType();
 
 		/**
 		 * The meta object literal for the '<em><b>Missing Affectation Symbole</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_BINDING__MISSING_AFFECTATION_SYMBOLE = eINSTANCE
 				.getErrorBinding_MissingAffectationSymbole();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Affectation Symbole Position</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Affectation Symbole Position</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_BINDING__MISSING_AFFECTATION_SYMBOLE_POSITION = eINSTANCE
@@ -6272,8 +6282,8 @@
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.acceleo.Statement <em>Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.Statement
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getStatement()
 		 * @generated
@@ -6281,9 +6291,9 @@
 		EClass STATEMENT = eINSTANCE.getStatement();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.LeafStatementImpl <em>Leaf Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.LeafStatementImpl <em>Leaf
+		 * Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.LeafStatementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getLeafStatement()
 		 * @generated
@@ -6291,17 +6301,17 @@
 		EClass LEAF_STATEMENT = eINSTANCE.getLeafStatement();
 
 		/**
-		 * The meta object literal for the '<em><b>New Line Needed</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>New Line Needed</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute LEAF_STATEMENT__NEW_LINE_NEEDED = eINSTANCE.getLeafStatement_NewLineNeeded();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ExpressionStatementImpl <em>Expression Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ExpressionStatementImpl
+		 * <em>Expression Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ExpressionStatementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getExpressionStatement()
 		 * @generated
@@ -6309,17 +6319,17 @@
 		EClass EXPRESSION_STATEMENT = eINSTANCE.getExpressionStatement();
 
 		/**
-		 * The meta object literal for the '<em><b>Expression</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Expression</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EXPRESSION_STATEMENT__EXPRESSION = eINSTANCE.getExpressionStatement_Expression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorExpressionStatementImpl <em>Error Expression Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorExpressionStatementImpl
+		 * <em>Error Expression Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorExpressionStatementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorExpressionStatement()
 		 * @generated
@@ -6327,18 +6337,18 @@
 		EClass ERROR_EXPRESSION_STATEMENT = eINSTANCE.getErrorExpressionStatement();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_EXPRESSION_STATEMENT__MISSING_END_HEADER = eINSTANCE
 				.getErrorExpressionStatement_MissingEndHeader();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ProtectedAreaImpl <em>Protected Area</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ProtectedAreaImpl <em>Protected
+		 * Area</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ProtectedAreaImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getProtectedArea()
 		 * @generated
@@ -6346,25 +6356,25 @@
 		EClass PROTECTED_AREA = eINSTANCE.getProtectedArea();
 
 		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Id</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PROTECTED_AREA__ID = eINSTANCE.getProtectedArea_Id();
 
 		/**
-		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PROTECTED_AREA__BODY = eINSTANCE.getProtectedArea_Body();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl <em>Error Protected Area</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl <em>Error
+		 * Protected Area</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorProtectedAreaImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorProtectedArea()
 		 * @generated
@@ -6372,44 +6382,44 @@
 		EClass ERROR_PROTECTED_AREA = eINSTANCE.getErrorProtectedArea();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Open Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Open Parenthesis</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_PROTECTED_AREA__MISSING_OPEN_PARENTHESIS = eINSTANCE
 				.getErrorProtectedArea_MissingOpenParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Close Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Close Parenthesis</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_PROTECTED_AREA__MISSING_CLOSE_PARENTHESIS = eINSTANCE
 				.getErrorProtectedArea_MissingCloseParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_PROTECTED_AREA__MISSING_END_HEADER = eINSTANCE
 				.getErrorProtectedArea_MissingEndHeader();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_PROTECTED_AREA__MISSING_END = eINSTANCE.getErrorProtectedArea_MissingEnd();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ForStatementImpl <em>For Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ForStatementImpl <em>For
+		 * Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ForStatementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getForStatement()
 		 * @generated
@@ -6417,33 +6427,33 @@
 		EClass FOR_STATEMENT = eINSTANCE.getForStatement();
 
 		/**
-		 * The meta object literal for the '<em><b>Binding</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Binding</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FOR_STATEMENT__BINDING = eINSTANCE.getForStatement_Binding();
 
 		/**
-		 * The meta object literal for the '<em><b>Separator</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Separator</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FOR_STATEMENT__SEPARATOR = eINSTANCE.getForStatement_Separator();
 
 		/**
-		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FOR_STATEMENT__BODY = eINSTANCE.getForStatement_Body();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorForStatementImpl <em>Error For Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorForStatementImpl <em>Error
+		 * For Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorForStatementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorForStatement()
 		 * @generated
@@ -6451,61 +6461,61 @@
 		EClass ERROR_FOR_STATEMENT = eINSTANCE.getErrorForStatement();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Open Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Open Parenthesis</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_FOR_STATEMENT__MISSING_OPEN_PARENTHESIS = eINSTANCE
 				.getErrorForStatement_MissingOpenParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Binding</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Binding</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_FOR_STATEMENT__MISSING_BINDING = eINSTANCE.getErrorForStatement_MissingBinding();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Close Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Close Parenthesis</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_FOR_STATEMENT__MISSING_CLOSE_PARENTHESIS = eINSTANCE
 				.getErrorForStatement_MissingCloseParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Separator Close Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Separator Close Parenthesis</b></em>' attribute
+		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_FOR_STATEMENT__MISSING_SEPARATOR_CLOSE_PARENTHESIS = eINSTANCE
 				.getErrorForStatement_MissingSeparatorCloseParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_FOR_STATEMENT__MISSING_END_HEADER = eINSTANCE
 				.getErrorForStatement_MissingEndHeader();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_FOR_STATEMENT__MISSING_END = eINSTANCE.getErrorForStatement_MissingEnd();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.IfStatementImpl <em>If Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.IfStatementImpl <em>If
+		 * Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.IfStatementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getIfStatement()
 		 * @generated
@@ -6513,33 +6523,33 @@
 		EClass IF_STATEMENT = eINSTANCE.getIfStatement();
 
 		/**
-		 * The meta object literal for the '<em><b>Condition</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Condition</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference IF_STATEMENT__CONDITION = eINSTANCE.getIfStatement_Condition();
 
 		/**
-		 * The meta object literal for the '<em><b>Then</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Then</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference IF_STATEMENT__THEN = eINSTANCE.getIfStatement_Then();
 
 		/**
-		 * The meta object literal for the '<em><b>Else</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Else</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference IF_STATEMENT__ELSE = eINSTANCE.getIfStatement_Else();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl <em>Error If Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl <em>Error If
+		 * Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorIfStatementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorIfStatement()
 		 * @generated
@@ -6547,43 +6557,43 @@
 		EClass ERROR_IF_STATEMENT = eINSTANCE.getErrorIfStatement();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Open Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Open Parenthesis</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_IF_STATEMENT__MISSING_OPEN_PARENTHESIS = eINSTANCE
 				.getErrorIfStatement_MissingOpenParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Close Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Close Parenthesis</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_IF_STATEMENT__MISSING_CLOSE_PARENTHESIS = eINSTANCE
 				.getErrorIfStatement_MissingCloseParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_IF_STATEMENT__MISSING_END_HEADER = eINSTANCE.getErrorIfStatement_MissingEndHeader();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_IF_STATEMENT__MISSING_END = eINSTANCE.getErrorIfStatement_MissingEnd();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.LetStatementImpl <em>Let Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.LetStatementImpl <em>Let
+		 * Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.LetStatementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getLetStatement()
 		 * @generated
@@ -6592,24 +6602,24 @@
 
 		/**
 		 * The meta object literal for the '<em><b>Variables</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference LET_STATEMENT__VARIABLES = eINSTANCE.getLetStatement_Variables();
 
 		/**
-		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference LET_STATEMENT__BODY = eINSTANCE.getLetStatement_Body();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorLetStatementImpl <em>Error Let Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorLetStatementImpl <em>Error
+		 * Let Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorLetStatementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorLetStatement()
 		 * @generated
@@ -6617,34 +6627,34 @@
 		EClass ERROR_LET_STATEMENT = eINSTANCE.getErrorLetStatement();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Bindings</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Bindings</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_LET_STATEMENT__MISSING_BINDINGS = eINSTANCE.getErrorLetStatement_MissingBindings();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_LET_STATEMENT__MISSING_END_HEADER = eINSTANCE
 				.getErrorLetStatement_MissingEndHeader();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_LET_STATEMENT__MISSING_END = eINSTANCE.getErrorLetStatement_MissingEnd();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.FileStatementImpl <em>File Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.FileStatementImpl <em>File
+		 * Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.FileStatementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getFileStatement()
 		 * @generated
@@ -6652,41 +6662,41 @@
 		EClass FILE_STATEMENT = eINSTANCE.getFileStatement();
 
 		/**
-		 * The meta object literal for the '<em><b>Mode</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Mode</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute FILE_STATEMENT__MODE = eINSTANCE.getFileStatement_Mode();
 
 		/**
-		 * The meta object literal for the '<em><b>Url</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Url</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FILE_STATEMENT__URL = eINSTANCE.getFileStatement_Url();
 
 		/**
-		 * The meta object literal for the '<em><b>Charset</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Charset</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FILE_STATEMENT__CHARSET = eINSTANCE.getFileStatement_Charset();
 
 		/**
-		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference FILE_STATEMENT__BODY = eINSTANCE.getFileStatement_Body();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl <em>Error File Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl <em>Error
+		 * File Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.ErrorFileStatementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getErrorFileStatement()
 		 * @generated
@@ -6694,61 +6704,61 @@
 		EClass ERROR_FILE_STATEMENT = eINSTANCE.getErrorFileStatement();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Open Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Open Parenthesis</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_FILE_STATEMENT__MISSING_OPEN_PARENTHESIS = eINSTANCE
 				.getErrorFileStatement_MissingOpenParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Comma</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Comma</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_FILE_STATEMENT__MISSING_COMMA = eINSTANCE.getErrorFileStatement_MissingComma();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Open Mode</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Open Mode</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_FILE_STATEMENT__MISSING_OPEN_MODE = eINSTANCE
 				.getErrorFileStatement_MissingOpenMode();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing Close Parenthesis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing Close Parenthesis</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_FILE_STATEMENT__MISSING_CLOSE_PARENTHESIS = eINSTANCE
 				.getErrorFileStatement_MissingCloseParenthesis();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End Header</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_FILE_STATEMENT__MISSING_END_HEADER = eINSTANCE
 				.getErrorFileStatement_MissingEndHeader();
 
 		/**
-		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Missing End</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ERROR_FILE_STATEMENT__MISSING_END = eINSTANCE.getErrorFileStatement_MissingEnd();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.TextStatementImpl <em>Text Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.TextStatementImpl <em>Text
+		 * Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.TextStatementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getTextStatement()
 		 * @generated
@@ -6756,17 +6766,17 @@
 		EClass TEXT_STATEMENT = eINSTANCE.getTextStatement();
 
 		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TEXT_STATEMENT__VALUE = eINSTANCE.getTextStatement_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.NewLineStatementImpl <em>New Line Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.impl.NewLineStatementImpl <em>New Line
+		 * Statement</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.impl.NewLineStatementImpl
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getNewLineStatement()
 		 * @generated
@@ -6774,17 +6784,17 @@
 		EClass NEW_LINE_STATEMENT = eINSTANCE.getNewLineStatement();
 
 		/**
-		 * The meta object literal for the '<em><b>Indentation Needed</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>Indentation Needed</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute NEW_LINE_STATEMENT__INDENTATION_NEEDED = eINSTANCE.getNewLineStatement_IndentationNeeded();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.VisibilityKind <em>Visibility Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.VisibilityKind <em>Visibility
+		 * Kind</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.VisibilityKind
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getVisibilityKind()
 		 * @generated
@@ -6792,9 +6802,9 @@
 		EEnum VISIBILITY_KIND = eINSTANCE.getVisibilityKind();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.OpenModeKind <em>Open Mode Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '{@link org.eclipse.acceleo.OpenModeKind <em>Open Mode Kind</em>}'
+		 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.OpenModeKind
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getOpenModeKind()
 		 * @generated
@@ -6802,9 +6812,9 @@
 		EEnum OPEN_MODE_KIND = eINSTANCE.getOpenModeKind();
 
 		/**
-		 * The meta object literal for the '<em>AST Result</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>AST Result</em>' data type. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.query.parser.AstResult
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getASTResult()
 		 * @generated
@@ -6812,9 +6822,9 @@
 		EDataType AST_RESULT = eINSTANCE.getASTResult();
 
 		/**
-		 * The meta object literal for the '<em>Module Qualified Name</em>' data type.
-		 * <!-- begin-user-doc -->
+		 * The meta object literal for the '<em>Module Qualified Name</em>' data type. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see java.lang.String
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getModuleQualifiedName()
 		 * @generated
@@ -6822,9 +6832,9 @@
 		EDataType MODULE_QUALIFIED_NAME = eINSTANCE.getModuleQualifiedName();
 
 		/**
-		 * The meta object literal for the '<em>Ast Result</em>' data type.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em>Ast Result</em>' data type. <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.acceleo.aql.parser.AcceleoAstResult
 		 * @see org.eclipse.acceleo.impl.AcceleoPackageImpl#getAcceleoAstResult()
 		 * @generated
@@ -6833,4 +6843,4 @@
 
 	}
 
-} //AcceleoPackage
+} // AcceleoPackage
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Binding.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Binding.java
index 81fc935..0e0b5b9 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Binding.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Binding.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,13 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Binding</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Binding</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.Binding#getInitExpression <em>Init Expression</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Binding#getInitExpression <em>Init Expression</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getBinding()
@@ -29,13 +27,14 @@
  */
 public interface Binding extends Variable {
 	/**
-	 * Returns the value of the '<em><b>Init Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Init Expression</b></em>' containment reference. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Init Expression</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Init Expression</em>' containment reference isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Init Expression</em>' containment reference.
 	 * @see #setInitExpression(Expression)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getBinding_InitExpression()
@@ -45,10 +44,11 @@
 	Expression getInitExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Binding#getInitExpression <em>Init Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Init Expression</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Binding#getInitExpression <em>Init Expression</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Init Expression</em>' containment reference.
 	 * @see #getInitExpression()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Block.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Block.java
index a32dea8..64cc99e 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Block.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Block.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,16 +14,13 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Block</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Block</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.Block#getStatements <em>Statements</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Block#isInlined <em>Inlined</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Block#getStatements <em>Statements</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Block#isInlined <em>Inlined</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getBlock()
@@ -32,14 +29,14 @@
  */
 public interface Block extends ASTNode {
 	/**
-	 * Returns the value of the '<em><b>Statements</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.acceleo.Statement}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Statements</b></em>' containment reference list. The list contents are
+	 * of type {@link org.eclipse.acceleo.Statement}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Statements</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Statements</em>' containment reference list isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Statements</em>' containment reference list.
 	 * @see org.eclipse.acceleo.AcceleoPackage#getBlock_Statements()
 	 * @model containment="true"
@@ -48,9 +45,9 @@
 	EList<Statement> getStatements();
 
 	/**
-	 * Returns the value of the '<em><b>Inlined</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the value of the '<em><b>Inlined</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the value of the '<em>Inlined</em>' attribute.
 	 * @see #setInlined(boolean)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getBlock_Inlined()
@@ -60,10 +57,11 @@
 	boolean isInlined();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Block#isInlined <em>Inlined</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Inlined</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Block#isInlined <em>Inlined</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Inlined</em>' attribute.
 	 * @see #isInlined()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/BlockComment.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/BlockComment.java
index f1c5a10..3e501ce 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/BlockComment.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/BlockComment.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,10 +12,8 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Block Comment</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Block Comment</b></em>'. <!--
+ * end-user-doc -->
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getBlockComment()
  * @model
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Comment.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Comment.java
index 86d4913..e887b6c 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Comment.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Comment.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,13 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Comment</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Comment</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.Comment#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Comment#getBody <em>Body</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getComment()
@@ -29,13 +27,13 @@
  */
 public interface Comment extends ModuleElement, Statement {
 	/**
-	 * Returns the value of the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Body</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Body</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Body</em>' containment reference.
 	 * @see #setBody(CommentBody)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getComment_Body()
@@ -45,10 +43,11 @@
 	CommentBody getBody();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Comment#getBody <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Body</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Comment#getBody <em>Body</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Body</em>' containment reference.
 	 * @see #getBody()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/CommentBody.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/CommentBody.java
index b210d8d..ce3cfaa 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/CommentBody.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/CommentBody.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,13 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Comment Body</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Comment Body</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.CommentBody#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.acceleo.CommentBody#getValue <em>Value</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getCommentBody()
@@ -29,13 +27,13 @@
  */
 public interface CommentBody extends ASTNode {
 	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getCommentBody_Value()
@@ -45,10 +43,11 @@
 	String getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.CommentBody#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.CommentBody#getValue <em>Value</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Documentation.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Documentation.java
index 20cba51..3617dbc 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Documentation.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Documentation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,13 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Documentation</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Documentation</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.Documentation#getDocumentedElement <em>Documented Element</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Documentation#getDocumentedElement <em>Documented Element</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getDocumentation()
@@ -29,14 +27,15 @@
  */
 public interface Documentation extends Comment {
 	/**
-	 * Returns the value of the '<em><b>Documented Element</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.acceleo.DocumentedElement#getDocumentation <em>Documentation</em>}'.
+	 * Returns the value of the '<em><b>Documented Element</b></em>' reference. It is bidirectional and its
+	 * opposite is '{@link org.eclipse.acceleo.DocumentedElement#getDocumentation <em>Documentation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Documented Element</em>' container reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Documented Element</em>' container reference isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Documented Element</em>' reference.
 	 * @see #setDocumentedElement(DocumentedElement)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getDocumentation_DocumentedElement()
@@ -47,10 +46,11 @@
 	DocumentedElement getDocumentedElement();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Documentation#getDocumentedElement <em>Documented Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Documented Element</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Documentation#getDocumentedElement <em>Documented
+	 * Element</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Documented Element</em>' reference.
 	 * @see #getDocumentedElement()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/DocumentedElement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/DocumentedElement.java
index 9bd2b32..2f7ef6b 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/DocumentedElement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/DocumentedElement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,16 +12,14 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Documented Element</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Documented Element</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.DocumentedElement#getDocumentation <em>Documentation</em>}</li>
- *   <li>{@link org.eclipse.acceleo.DocumentedElement#isDeprecated <em>Deprecated</em>}</li>
+ * <li>{@link org.eclipse.acceleo.DocumentedElement#getDocumentation <em>Documentation</em>}</li>
+ * <li>{@link org.eclipse.acceleo.DocumentedElement#isDeprecated <em>Deprecated</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getDocumentedElement()
@@ -30,14 +28,15 @@
  */
 public interface DocumentedElement extends ASTNode {
 	/**
-	 * Returns the value of the '<em><b>Documentation</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.acceleo.Documentation#getDocumentedElement <em>Documented Element</em>}'.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Documentation</b></em>' reference. It is bidirectional and its
+	 * opposite is '{@link org.eclipse.acceleo.Documentation#getDocumentedElement <em>Documented
+	 * Element</em>}'. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Documentation</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Documentation</em>' containment reference isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Documentation</em>' reference.
 	 * @see #setDocumentation(Documentation)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getDocumentedElement_Documentation()
@@ -48,24 +47,25 @@
 	Documentation getDocumentation();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.DocumentedElement#getDocumentation <em>Documentation</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Documentation</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.DocumentedElement#getDocumentation
+	 * <em>Documentation</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Documentation</em>' reference.
 	 * @see #getDocumentation()
 	 * @generated
 	 */
 	void setDocumentation(Documentation value);
 
 	/**
-	 * Returns the value of the '<em><b>Deprecated</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Deprecated</b></em>' attribute. The default value is
+	 * <code>"false"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Deprecated</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Deprecated</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Deprecated</em>' attribute.
 	 * @see #setDeprecated(boolean)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getDocumentedElement_Deprecated()
@@ -75,10 +75,11 @@
 	boolean isDeprecated();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.DocumentedElement#isDeprecated <em>Deprecated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Deprecated</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.DocumentedElement#isDeprecated <em>Deprecated</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Deprecated</em>' attribute.
 	 * @see #isDeprecated()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Error.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Error.java
index a731097..2e7b492 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Error.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Error.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,10 +12,7 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error</b></em>'. <!-- end-user-doc -->
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getError()
  * @model interface="true" abstract="true"
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorBinding.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorBinding.java
index cd42b2f..fa41a31 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorBinding.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorBinding.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,19 +12,19 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Binding</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Binding</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorBinding#getMissingName <em>Missing Name</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorBinding#getMissingColon <em>Missing Colon</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorBinding#getMissingType <em>Missing Type</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorBinding#getMissingAffectationSymbole <em>Missing Affectation Symbole</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorBinding#getMissingAffectationSymbolePosition <em>Missing Affectation Symbole Position</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorBinding#getMissingName <em>Missing Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorBinding#getMissingColon <em>Missing Colon</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorBinding#getMissingType <em>Missing Type</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorBinding#getMissingAffectationSymbole <em>Missing Affectation
+ * Symbole</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorBinding#getMissingAffectationSymbolePosition <em>Missing Affectation
+ * Symbole Position</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorBinding()
@@ -33,14 +33,14 @@
  */
 public interface ErrorBinding extends org.eclipse.acceleo.Error, Binding {
 	/**
-	 * Returns the value of the '<em><b>Missing Name</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Name</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Name</em>' attribute.
 	 * @see #setMissingName(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorBinding_MissingName()
@@ -50,24 +50,25 @@
 	int getMissingName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorBinding#getMissingName <em>Missing Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Name</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorBinding#getMissingName <em>Missing Name</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Name</em>' attribute.
 	 * @see #getMissingName()
 	 * @generated
 	 */
 	void setMissingName(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Colon</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Colon</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Colon</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Colon</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Colon</em>' attribute.
 	 * @see #setMissingColon(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorBinding_MissingColon()
@@ -77,24 +78,25 @@
 	int getMissingColon();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorBinding#getMissingColon <em>Missing Colon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Colon</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorBinding#getMissingColon <em>Missing Colon</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Colon</em>' attribute.
 	 * @see #getMissingColon()
 	 * @generated
 	 */
 	void setMissingColon(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Type</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Type</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Type</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Type</em>' attribute.
 	 * @see #setMissingType(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorBinding_MissingType()
@@ -104,23 +106,25 @@
 	int getMissingType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorBinding#getMissingType <em>Missing Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Type</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorBinding#getMissingType <em>Missing Type</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Type</em>' attribute.
 	 * @see #getMissingType()
 	 * @generated
 	 */
 	void setMissingType(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Affectation Symbole</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Affectation Symbole</b></em>' attribute. <!-- begin-user-doc
+	 * -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Affectation Symbole</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Affectation Symbole</em>' attribute isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Affectation Symbole</em>' attribute.
 	 * @see #setMissingAffectationSymbole(String)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorBinding_MissingAffectationSymbole()
@@ -130,24 +134,25 @@
 	String getMissingAffectationSymbole();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorBinding#getMissingAffectationSymbole <em>Missing Affectation Symbole</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Affectation Symbole</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorBinding#getMissingAffectationSymbole <em>Missing
+	 * Affectation Symbole</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Affectation Symbole</em>' attribute.
 	 * @see #getMissingAffectationSymbole()
 	 * @generated
 	 */
 	void setMissingAffectationSymbole(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Affectation Symbole Position</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Affectation Symbole Position</b></em>' attribute. The default
+	 * value is <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Affectation Symbole Position</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Affectation Symbole Position</em>' attribute isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Affectation Symbole Position</em>' attribute.
 	 * @see #setMissingAffectationSymbolePosition(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorBinding_MissingAffectationSymbolePosition()
@@ -157,10 +162,12 @@
 	int getMissingAffectationSymbolePosition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorBinding#getMissingAffectationSymbolePosition <em>Missing Affectation Symbole Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Affectation Symbole Position</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorBinding#getMissingAffectationSymbolePosition
+	 * <em>Missing Affectation Symbole Position</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Affectation Symbole Position</em>' attribute.
 	 * @see #getMissingAffectationSymbolePosition()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorBlockComment.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorBlockComment.java
index 2c0e3b8..4c1123e 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorBlockComment.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorBlockComment.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,10 +12,8 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Block Comment</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Block Comment</b></em>'. <!--
+ * end-user-doc -->
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorBlockComment()
  * @model
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorComment.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorComment.java
index e439295..c09d485 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorComment.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorComment.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,13 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Comment</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Comment</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorComment#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorComment#getMissingEndHeader <em>Missing End Header</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorComment()
@@ -29,14 +27,14 @@
  */
 public interface ErrorComment extends org.eclipse.acceleo.Error, Comment {
 	/**
-	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End Header</em>' attribute.
 	 * @see #setMissingEndHeader(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorComment_MissingEndHeader()
@@ -46,10 +44,11 @@
 	int getMissingEndHeader();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorComment#getMissingEndHeader <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End Header</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorComment#getMissingEndHeader <em>Missing End
+	 * Header</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End Header</em>' attribute.
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorExpression.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorExpression.java
index d5a06ef..cf664a0 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorExpression.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorExpression.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,10 +12,8 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Expression</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Expression</b></em>'. <!--
+ * end-user-doc -->
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorExpression()
  * @model
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorExpressionStatement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorExpressionStatement.java
index caec7d1..9dfa2cc 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorExpressionStatement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorExpressionStatement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,14 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Expression Statement</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Expression Statement</b></em>'.
  * <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorExpressionStatement#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorExpressionStatement#getMissingEndHeader <em>Missing End
+ * Header</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorExpressionStatement()
@@ -29,14 +28,14 @@
  */
 public interface ErrorExpressionStatement extends org.eclipse.acceleo.Error, ExpressionStatement {
 	/**
-	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End Header</em>' attribute.
 	 * @see #setMissingEndHeader(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorExpressionStatement_MissingEndHeader()
@@ -46,10 +45,11 @@
 	int getMissingEndHeader();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorExpressionStatement#getMissingEndHeader <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End Header</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorExpressionStatement#getMissingEndHeader
+	 * <em>Missing End Header</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End Header</em>' attribute.
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorFileStatement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorFileStatement.java
index 857afa4..2c63c8b 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorFileStatement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorFileStatement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,20 +12,20 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error File Statement</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error File Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorFileStatement#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorFileStatement#getMissingComma <em>Missing Comma</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorFileStatement#getMissingOpenMode <em>Missing Open Mode</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorFileStatement#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorFileStatement#getMissingEndHeader <em>Missing End Header</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorFileStatement#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorFileStatement#getMissingOpenParenthesis <em>Missing Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorFileStatement#getMissingComma <em>Missing Comma</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorFileStatement#getMissingOpenMode <em>Missing Open Mode</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorFileStatement#getMissingCloseParenthesis <em>Missing Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorFileStatement#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorFileStatement#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorFileStatement()
@@ -34,14 +34,14 @@
  */
 public interface ErrorFileStatement extends org.eclipse.acceleo.Error, FileStatement {
 	/**
-	 * Returns the value of the '<em><b>Missing Open Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Open Parenthesis</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Open Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Open Parenthesis</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Open Parenthesis</em>' attribute.
 	 * @see #setMissingOpenParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorFileStatement_MissingOpenParenthesis()
@@ -51,24 +51,25 @@
 	int getMissingOpenParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Open Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingOpenParenthesis
+	 * <em>Missing Open Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Open Parenthesis</em>' attribute.
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 */
 	void setMissingOpenParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Comma</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Comma</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Comma</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Comma</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Comma</em>' attribute.
 	 * @see #setMissingComma(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorFileStatement_MissingComma()
@@ -78,24 +79,25 @@
 	int getMissingComma();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingComma <em>Missing Comma</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Comma</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingComma <em>Missing
+	 * Comma</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Comma</em>' attribute.
 	 * @see #getMissingComma()
 	 * @generated
 	 */
 	void setMissingComma(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Open Mode</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Open Mode</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Open Mode</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Open Mode</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Open Mode</em>' attribute.
 	 * @see #setMissingOpenMode(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorFileStatement_MissingOpenMode()
@@ -105,24 +107,25 @@
 	int getMissingOpenMode();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingOpenMode <em>Missing Open Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Open Mode</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingOpenMode <em>Missing
+	 * Open Mode</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Open Mode</em>' attribute.
 	 * @see #getMissingOpenMode()
 	 * @generated
 	 */
 	void setMissingOpenMode(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Close Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Close Parenthesis</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Close Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Close Parenthesis</em>' attribute isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Close Parenthesis</em>' attribute.
 	 * @see #setMissingCloseParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorFileStatement_MissingCloseParenthesis()
@@ -132,24 +135,25 @@
 	int getMissingCloseParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Close Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingCloseParenthesis
+	 * <em>Missing Close Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Close Parenthesis</em>' attribute.
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 */
 	void setMissingCloseParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End Header</em>' attribute.
 	 * @see #setMissingEndHeader(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorFileStatement_MissingEndHeader()
@@ -159,24 +163,25 @@
 	int getMissingEndHeader();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingEndHeader <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End Header</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingEndHeader <em>Missing
+	 * End Header</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End Header</em>' attribute.
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 */
 	void setMissingEndHeader(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End</em>' attribute.
 	 * @see #setMissingEnd(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorFileStatement_MissingEnd()
@@ -186,10 +191,11 @@
 	int getMissingEnd();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingEnd <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorFileStatement#getMissingEnd <em>Missing
+	 * End</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End</em>' attribute.
 	 * @see #getMissingEnd()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorForStatement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorForStatement.java
index 9bd10b8..aa3c9c0 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorForStatement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorForStatement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,20 +12,21 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error For Statement</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error For Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorForStatement#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorForStatement#getMissingBinding <em>Missing Binding</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorForStatement#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorForStatement#getMissingSeparatorCloseParenthesis <em>Missing Separator Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorForStatement#getMissingEndHeader <em>Missing End Header</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorForStatement#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorForStatement#getMissingOpenParenthesis <em>Missing Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorForStatement#getMissingBinding <em>Missing Binding</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorForStatement#getMissingCloseParenthesis <em>Missing Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorForStatement#getMissingSeparatorCloseParenthesis <em>Missing Separator
+ * Close Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorForStatement#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorForStatement#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorForStatement()
@@ -34,14 +35,14 @@
  */
 public interface ErrorForStatement extends org.eclipse.acceleo.Error, ForStatement {
 	/**
-	 * Returns the value of the '<em><b>Missing Open Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Open Parenthesis</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Open Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Open Parenthesis</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Open Parenthesis</em>' attribute.
 	 * @see #setMissingOpenParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorForStatement_MissingOpenParenthesis()
@@ -51,24 +52,25 @@
 	int getMissingOpenParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorForStatement#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Open Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorForStatement#getMissingOpenParenthesis
+	 * <em>Missing Open Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Open Parenthesis</em>' attribute.
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 */
 	void setMissingOpenParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Binding</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Binding</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Binding</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Binding</em>' attribute isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Binding</em>' attribute.
 	 * @see #setMissingBinding(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorForStatement_MissingBinding()
@@ -78,24 +80,25 @@
 	int getMissingBinding();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorForStatement#getMissingBinding <em>Missing Binding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Binding</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorForStatement#getMissingBinding <em>Missing
+	 * Binding</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Binding</em>' attribute.
 	 * @see #getMissingBinding()
 	 * @generated
 	 */
 	void setMissingBinding(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Close Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Close Parenthesis</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Close Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Close Parenthesis</em>' attribute isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Close Parenthesis</em>' attribute.
 	 * @see #setMissingCloseParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorForStatement_MissingCloseParenthesis()
@@ -105,20 +108,20 @@
 	int getMissingCloseParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorForStatement#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Close Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorForStatement#getMissingCloseParenthesis
+	 * <em>Missing Close Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Close Parenthesis</em>' attribute.
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 */
 	void setMissingCloseParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Separator Close Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the value of the '<em><b>Missing Separator Close Parenthesis</b></em>' attribute. The default
+	 * value is <code>"-1"</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Separator Close Parenthesis</em>' attribute.
 	 * @see #setMissingSeparatorCloseParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorForStatement_MissingSeparatorCloseParenthesis()
@@ -128,24 +131,25 @@
 	int getMissingSeparatorCloseParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorForStatement#getMissingSeparatorCloseParenthesis <em>Missing Separator Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Separator Close Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorForStatement#getMissingSeparatorCloseParenthesis
+	 * <em>Missing Separator Close Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Separator Close Parenthesis</em>' attribute.
 	 * @see #getMissingSeparatorCloseParenthesis()
 	 * @generated
 	 */
 	void setMissingSeparatorCloseParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End Header</em>' attribute.
 	 * @see #setMissingEndHeader(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorForStatement_MissingEndHeader()
@@ -155,24 +159,25 @@
 	int getMissingEndHeader();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorForStatement#getMissingEndHeader <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End Header</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorForStatement#getMissingEndHeader <em>Missing End
+	 * Header</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End Header</em>' attribute.
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 */
 	void setMissingEndHeader(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End</em>' attribute.
 	 * @see #setMissingEnd(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorForStatement_MissingEnd()
@@ -182,10 +187,11 @@
 	int getMissingEnd();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorForStatement#getMissingEnd <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorForStatement#getMissingEnd <em>Missing
+	 * End</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End</em>' attribute.
 	 * @see #getMissingEnd()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorIfStatement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorIfStatement.java
index 98b0bcf..b80f7a8 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorIfStatement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorIfStatement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,18 +12,18 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error If Statement</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error If Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorIfStatement#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorIfStatement#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorIfStatement#getMissingEndHeader <em>Missing End Header</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorIfStatement#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorIfStatement#getMissingOpenParenthesis <em>Missing Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorIfStatement#getMissingCloseParenthesis <em>Missing Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorIfStatement#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorIfStatement#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorIfStatement()
@@ -32,14 +32,14 @@
  */
 public interface ErrorIfStatement extends org.eclipse.acceleo.Error, IfStatement {
 	/**
-	 * Returns the value of the '<em><b>Missing Open Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Open Parenthesis</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Open Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Open Parenthesis</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Open Parenthesis</em>' attribute.
 	 * @see #setMissingOpenParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorIfStatement_MissingOpenParenthesis()
@@ -49,24 +49,25 @@
 	int getMissingOpenParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Open Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingOpenParenthesis
+	 * <em>Missing Open Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Open Parenthesis</em>' attribute.
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 */
 	void setMissingOpenParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Close Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Close Parenthesis</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Close Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Close Parenthesis</em>' attribute isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Close Parenthesis</em>' attribute.
 	 * @see #setMissingCloseParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorIfStatement_MissingCloseParenthesis()
@@ -76,24 +77,25 @@
 	int getMissingCloseParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Close Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingCloseParenthesis
+	 * <em>Missing Close Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Close Parenthesis</em>' attribute.
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 */
 	void setMissingCloseParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End Header</em>' attribute.
 	 * @see #setMissingEndHeader(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorIfStatement_MissingEndHeader()
@@ -103,24 +105,25 @@
 	int getMissingEndHeader();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingEndHeader <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End Header</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingEndHeader <em>Missing End
+	 * Header</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End Header</em>' attribute.
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 */
 	void setMissingEndHeader(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End</em>' attribute.
 	 * @see #setMissingEnd(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorIfStatement_MissingEnd()
@@ -130,10 +133,11 @@
 	int getMissingEnd();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingEnd <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorIfStatement#getMissingEnd <em>Missing End</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End</em>' attribute.
 	 * @see #getMissingEnd()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorImport.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorImport.java
index 0c24898..8e80136 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorImport.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorImport.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,13 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Import</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Import</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorImport#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorImport#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorImport()
@@ -29,14 +27,14 @@
  */
 public interface ErrorImport extends org.eclipse.acceleo.Error, Import {
 	/**
-	 * Returns the value of the '<em><b>Missing End</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End</em>' attribute.
 	 * @see #setMissingEnd(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorImport_MissingEnd()
@@ -46,10 +44,11 @@
 	int getMissingEnd();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorImport#getMissingEnd <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorImport#getMissingEnd <em>Missing End</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End</em>' attribute.
 	 * @see #getMissingEnd()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorLetStatement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorLetStatement.java
index b7b4eed..6614599 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorLetStatement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorLetStatement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,17 +12,15 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Let Statement</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Let Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorLetStatement#getMissingBindings <em>Missing Bindings</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorLetStatement#getMissingEndHeader <em>Missing End Header</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorLetStatement#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorLetStatement#getMissingBindings <em>Missing Bindings</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorLetStatement#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorLetStatement#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorLetStatement()
@@ -31,14 +29,14 @@
  */
 public interface ErrorLetStatement extends org.eclipse.acceleo.Error, LetStatement {
 	/**
-	 * Returns the value of the '<em><b>Missing Bindings</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Bindings</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Bindings</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Bindings</em>' attribute isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Bindings</em>' attribute.
 	 * @see #setMissingBindings(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorLetStatement_MissingBindings()
@@ -48,24 +46,25 @@
 	int getMissingBindings();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorLetStatement#getMissingBindings <em>Missing Bindings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Bindings</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorLetStatement#getMissingBindings <em>Missing
+	 * Bindings</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Bindings</em>' attribute.
 	 * @see #getMissingBindings()
 	 * @generated
 	 */
 	void setMissingBindings(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End Header</em>' attribute.
 	 * @see #setMissingEndHeader(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorLetStatement_MissingEndHeader()
@@ -75,24 +74,25 @@
 	int getMissingEndHeader();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorLetStatement#getMissingEndHeader <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End Header</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorLetStatement#getMissingEndHeader <em>Missing End
+	 * Header</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End Header</em>' attribute.
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 */
 	void setMissingEndHeader(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End</em>' attribute.
 	 * @see #setMissingEnd(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorLetStatement_MissingEnd()
@@ -102,10 +102,11 @@
 	int getMissingEnd();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorLetStatement#getMissingEnd <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorLetStatement#getMissingEnd <em>Missing
+	 * End</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End</em>' attribute.
 	 * @see #getMissingEnd()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorMetamodel.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorMetamodel.java
index e3e4286..6643f60 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorMetamodel.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorMetamodel.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,16 +12,14 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Metamodel</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Metamodel</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorMetamodel#getFragment <em>Fragment</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorMetamodel#getMissingEndQuote <em>Missing End Quote</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorMetamodel#getFragment <em>Fragment</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorMetamodel#getMissingEndQuote <em>Missing End Quote</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorMetamodel()
@@ -30,13 +28,13 @@
  */
 public interface ErrorMetamodel extends org.eclipse.acceleo.Error, Metamodel {
 	/**
-	 * Returns the value of the '<em><b>Fragment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Fragment</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Fragment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Fragment</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Fragment</em>' attribute.
 	 * @see #setFragment(String)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorMetamodel_Fragment()
@@ -46,24 +44,25 @@
 	String getFragment();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorMetamodel#getFragment <em>Fragment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fragment</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorMetamodel#getFragment <em>Fragment</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Fragment</em>' attribute.
 	 * @see #getFragment()
 	 * @generated
 	 */
 	void setFragment(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End Quote</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End Quote</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End Quote</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End Quote</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End Quote</em>' attribute.
 	 * @see #setMissingEndQuote(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorMetamodel_MissingEndQuote()
@@ -73,10 +72,11 @@
 	int getMissingEndQuote();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorMetamodel#getMissingEndQuote <em>Missing End Quote</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End Quote</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorMetamodel#getMissingEndQuote <em>Missing End
+	 * Quote</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End Quote</em>' attribute.
 	 * @see #getMissingEndQuote()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModule.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModule.java
index 8be4e0d..e3b39fc 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModule.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,18 +12,18 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Module</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Module</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorModule#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorModule#getMissingEPackage <em>Missing EPackage</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorModule#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorModule#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorModule#getMissingOpenParenthesis <em>Missing Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorModule#getMissingEPackage <em>Missing EPackage</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorModule#getMissingCloseParenthesis <em>Missing Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorModule#getMissingEndHeader <em>Missing End Header</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorModule()
@@ -32,14 +32,14 @@
  */
 public interface ErrorModule extends org.eclipse.acceleo.Error, org.eclipse.acceleo.Module {
 	/**
-	 * Returns the value of the '<em><b>Missing Open Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Open Parenthesis</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Open Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Open Parenthesis</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Open Parenthesis</em>' attribute.
 	 * @see #setMissingOpenParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorModule_MissingOpenParenthesis()
@@ -49,24 +49,25 @@
 	int getMissingOpenParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorModule#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Open Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorModule#getMissingOpenParenthesis <em>Missing
+	 * Open Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Open Parenthesis</em>' attribute.
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 */
 	void setMissingOpenParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing EPackage</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing EPackage</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing EPackage</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing EPackage</em>' attribute isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing EPackage</em>' attribute.
 	 * @see #setMissingEPackage(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorModule_MissingEPackage()
@@ -76,24 +77,25 @@
 	int getMissingEPackage();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorModule#getMissingEPackage <em>Missing EPackage</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing EPackage</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorModule#getMissingEPackage <em>Missing
+	 * EPackage</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing EPackage</em>' attribute.
 	 * @see #getMissingEPackage()
 	 * @generated
 	 */
 	void setMissingEPackage(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Close Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Close Parenthesis</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Close Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Close Parenthesis</em>' attribute isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Close Parenthesis</em>' attribute.
 	 * @see #setMissingCloseParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorModule_MissingCloseParenthesis()
@@ -103,24 +105,25 @@
 	int getMissingCloseParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorModule#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Close Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorModule#getMissingCloseParenthesis <em>Missing
+	 * Close Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Close Parenthesis</em>' attribute.
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 */
 	void setMissingCloseParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End Header</em>' attribute.
 	 * @see #setMissingEndHeader(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorModule_MissingEndHeader()
@@ -130,10 +133,11 @@
 	int getMissingEndHeader();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorModule#getMissingEndHeader <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End Header</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorModule#getMissingEndHeader <em>Missing End
+	 * Header</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End Header</em>' attribute.
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModuleDocumentation.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModuleDocumentation.java
index 6c644ec..dd7721b 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModuleDocumentation.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModuleDocumentation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,14 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Module Documentation</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Module Documentation</b></em>'.
  * <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorModuleDocumentation#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorModuleDocumentation#getMissingEndHeader <em>Missing End
+ * Header</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorModuleDocumentation()
@@ -29,14 +28,14 @@
  */
 public interface ErrorModuleDocumentation extends org.eclipse.acceleo.Error, ModuleDocumentation {
 	/**
-	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End Header</em>' attribute.
 	 * @see #setMissingEndHeader(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorModuleDocumentation_MissingEndHeader()
@@ -46,10 +45,11 @@
 	int getMissingEndHeader();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorModuleDocumentation#getMissingEndHeader <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End Header</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorModuleDocumentation#getMissingEndHeader
+	 * <em>Missing End Header</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End Header</em>' attribute.
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModuleElementDocumentation.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModuleElementDocumentation.java
index 79f8430..6475d82 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModuleElementDocumentation.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModuleElementDocumentation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,14 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Module Element Documentation</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Module Element
+ * Documentation</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorModuleElementDocumentation#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorModuleElementDocumentation#getMissingEndHeader <em>Missing End
+ * Header</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorModuleElementDocumentation()
@@ -29,14 +28,14 @@
  */
 public interface ErrorModuleElementDocumentation extends org.eclipse.acceleo.Error, ModuleElementDocumentation {
 	/**
-	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End Header</em>' attribute.
 	 * @see #setMissingEndHeader(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorModuleElementDocumentation_MissingEndHeader()
@@ -46,10 +45,11 @@
 	int getMissingEndHeader();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorModuleElementDocumentation#getMissingEndHeader <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End Header</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorModuleElementDocumentation#getMissingEndHeader
+	 * <em>Missing End Header</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End Header</em>' attribute.
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModuleReference.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModuleReference.java
index 85247a5..4168c95 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModuleReference.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorModuleReference.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,10 +12,8 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Module Reference</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Module Reference</b></em>'. <!--
+ * end-user-doc -->
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorModuleReference()
  * @model
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorProtectedArea.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorProtectedArea.java
index 722c595..87454e4 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorProtectedArea.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorProtectedArea.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,18 +12,18 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Protected Area</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Protected Area</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingEndHeader <em>Missing End Header</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingOpenParenthesis <em>Missing Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingCloseParenthesis <em>Missing Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorProtectedArea()
@@ -32,14 +32,14 @@
  */
 public interface ErrorProtectedArea extends org.eclipse.acceleo.Error, ProtectedArea {
 	/**
-	 * Returns the value of the '<em><b>Missing Open Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Open Parenthesis</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Open Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Open Parenthesis</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Open Parenthesis</em>' attribute.
 	 * @see #setMissingOpenParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorProtectedArea_MissingOpenParenthesis()
@@ -49,24 +49,25 @@
 	int getMissingOpenParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Open Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingOpenParenthesis
+	 * <em>Missing Open Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Open Parenthesis</em>' attribute.
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 */
 	void setMissingOpenParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Close Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Close Parenthesis</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Close Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Close Parenthesis</em>' attribute isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Close Parenthesis</em>' attribute.
 	 * @see #setMissingCloseParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorProtectedArea_MissingCloseParenthesis()
@@ -76,24 +77,25 @@
 	int getMissingCloseParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Close Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingCloseParenthesis
+	 * <em>Missing Close Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Close Parenthesis</em>' attribute.
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 */
 	void setMissingCloseParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End Header</em>' attribute.
 	 * @see #setMissingEndHeader(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorProtectedArea_MissingEndHeader()
@@ -103,24 +105,25 @@
 	int getMissingEndHeader();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingEndHeader <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End Header</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingEndHeader <em>Missing
+	 * End Header</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End Header</em>' attribute.
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 */
 	void setMissingEndHeader(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End</em>' attribute.
 	 * @see #setMissingEnd(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorProtectedArea_MissingEnd()
@@ -130,10 +133,11 @@
 	int getMissingEnd();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingEnd <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorProtectedArea#getMissingEnd <em>Missing
+	 * End</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End</em>' attribute.
 	 * @see #getMissingEnd()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorQuery.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorQuery.java
index 9f03ef9..1717878 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorQuery.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,23 +12,22 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Query</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Query</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingVisibility <em>Missing Visibility</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingName <em>Missing Name</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingParameters <em>Missing Parameters</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingColon <em>Missing Colon</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingType <em>Missing Type</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingEqual <em>Missing Equal</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingVisibility <em>Missing Visibility</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingName <em>Missing Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingParameters <em>Missing Parameters</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingCloseParenthesis <em>Missing Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingColon <em>Missing Colon</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingType <em>Missing Type</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingEqual <em>Missing Equal</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorQuery#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorQuery()
@@ -37,14 +36,14 @@
  */
 public interface ErrorQuery extends org.eclipse.acceleo.Error, Query {
 	/**
-	 * Returns the value of the '<em><b>Missing Visibility</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Visibility</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Visibility</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Visibility</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Visibility</em>' attribute.
 	 * @see #setMissingVisibility(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorQuery_MissingVisibility()
@@ -54,24 +53,25 @@
 	int getMissingVisibility();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingVisibility <em>Missing Visibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Visibility</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingVisibility <em>Missing
+	 * Visibility</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Visibility</em>' attribute.
 	 * @see #getMissingVisibility()
 	 * @generated
 	 */
 	void setMissingVisibility(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Name</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Name</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Name</em>' attribute.
 	 * @see #setMissingName(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorQuery_MissingName()
@@ -81,24 +81,25 @@
 	int getMissingName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingName <em>Missing Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Name</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingName <em>Missing Name</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Name</em>' attribute.
 	 * @see #getMissingName()
 	 * @generated
 	 */
 	void setMissingName(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Open Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Open Parenthesis</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Open Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Open Parenthesis</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Open Parenthesis</em>' attribute.
 	 * @see #setMissingOpenParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorQuery_MissingOpenParenthesis()
@@ -108,24 +109,25 @@
 	int getMissingOpenParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Open Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingOpenParenthesis <em>Missing Open
+	 * Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Open Parenthesis</em>' attribute.
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 */
 	void setMissingOpenParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Parameters</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Parameters</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Parameters</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Parameters</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Parameters</em>' attribute.
 	 * @see #setMissingParameters(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorQuery_MissingParameters()
@@ -135,24 +137,25 @@
 	int getMissingParameters();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingParameters <em>Missing Parameters</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Parameters</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingParameters <em>Missing
+	 * Parameters</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Parameters</em>' attribute.
 	 * @see #getMissingParameters()
 	 * @generated
 	 */
 	void setMissingParameters(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Close Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Close Parenthesis</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Close Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Close Parenthesis</em>' attribute isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Close Parenthesis</em>' attribute.
 	 * @see #setMissingCloseParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorQuery_MissingCloseParenthesis()
@@ -162,24 +165,25 @@
 	int getMissingCloseParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Close Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingCloseParenthesis <em>Missing
+	 * Close Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Close Parenthesis</em>' attribute.
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 */
 	void setMissingCloseParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Colon</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Colon</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Colon</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Colon</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Colon</em>' attribute.
 	 * @see #setMissingColon(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorQuery_MissingColon()
@@ -189,24 +193,25 @@
 	int getMissingColon();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingColon <em>Missing Colon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Colon</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingColon <em>Missing Colon</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Colon</em>' attribute.
 	 * @see #getMissingColon()
 	 * @generated
 	 */
 	void setMissingColon(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Type</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Type</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Type</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Type</em>' attribute.
 	 * @see #setMissingType(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorQuery_MissingType()
@@ -216,24 +221,25 @@
 	int getMissingType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingType <em>Missing Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Type</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingType <em>Missing Type</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Type</em>' attribute.
 	 * @see #getMissingType()
 	 * @generated
 	 */
 	void setMissingType(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Equal</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Equal</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Equal</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Equal</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Equal</em>' attribute.
 	 * @see #setMissingEqual(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorQuery_MissingEqual()
@@ -243,24 +249,25 @@
 	int getMissingEqual();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingEqual <em>Missing Equal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Equal</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingEqual <em>Missing Equal</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Equal</em>' attribute.
 	 * @see #getMissingEqual()
 	 * @generated
 	 */
 	void setMissingEqual(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End</em>' attribute.
 	 * @see #setMissingEnd(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorQuery_MissingEnd()
@@ -270,10 +277,11 @@
 	int getMissingEnd();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingEnd <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorQuery#getMissingEnd <em>Missing End</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End</em>' attribute.
 	 * @see #getMissingEnd()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorTemplate.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorTemplate.java
index 4fd4560..4508149 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorTemplate.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorTemplate.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,24 +12,27 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Template</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Template</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingVisibility <em>Missing Visibility</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingName <em>Missing Name</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingParameters <em>Missing Parameters</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingGuardOpenParenthesis <em>Missing Guard Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingGuardCloseParenthesis <em>Missing Guard Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingPostCloseParenthesis <em>Missing Post Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingEndHeader <em>Missing End Header</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingVisibility <em>Missing Visibility</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingName <em>Missing Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingOpenParenthesis <em>Missing Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingParameters <em>Missing Parameters</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingCloseParenthesis <em>Missing Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingGuardOpenParenthesis <em>Missing Guard Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingGuardCloseParenthesis <em>Missing Guard Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingPostCloseParenthesis <em>Missing Post Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorTemplate#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorTemplate()
@@ -38,14 +41,14 @@
  */
 public interface ErrorTemplate extends org.eclipse.acceleo.Error, Template {
 	/**
-	 * Returns the value of the '<em><b>Missing Visibility</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Visibility</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Visibility</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Visibility</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Visibility</em>' attribute.
 	 * @see #setMissingVisibility(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorTemplate_MissingVisibility()
@@ -55,24 +58,25 @@
 	int getMissingVisibility();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingVisibility <em>Missing Visibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Visibility</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingVisibility <em>Missing
+	 * Visibility</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Visibility</em>' attribute.
 	 * @see #getMissingVisibility()
 	 * @generated
 	 */
 	void setMissingVisibility(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Name</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Name</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Name</em>' attribute.
 	 * @see #setMissingName(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorTemplate_MissingName()
@@ -82,24 +86,25 @@
 	int getMissingName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingName <em>Missing Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Name</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingName <em>Missing Name</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Name</em>' attribute.
 	 * @see #getMissingName()
 	 * @generated
 	 */
 	void setMissingName(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Open Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Open Parenthesis</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Open Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Open Parenthesis</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Open Parenthesis</em>' attribute.
 	 * @see #setMissingOpenParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorTemplate_MissingOpenParenthesis()
@@ -109,24 +114,25 @@
 	int getMissingOpenParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Open Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingOpenParenthesis <em>Missing
+	 * Open Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Open Parenthesis</em>' attribute.
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 */
 	void setMissingOpenParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Parameters</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Parameters</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Parameters</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Parameters</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Parameters</em>' attribute.
 	 * @see #setMissingParameters(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorTemplate_MissingParameters()
@@ -136,24 +142,25 @@
 	int getMissingParameters();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingParameters <em>Missing Parameters</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Parameters</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingParameters <em>Missing
+	 * Parameters</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Parameters</em>' attribute.
 	 * @see #getMissingParameters()
 	 * @generated
 	 */
 	void setMissingParameters(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Close Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Close Parenthesis</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Close Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Close Parenthesis</em>' attribute isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Close Parenthesis</em>' attribute.
 	 * @see #setMissingCloseParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorTemplate_MissingCloseParenthesis()
@@ -163,24 +170,25 @@
 	int getMissingCloseParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Close Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingCloseParenthesis <em>Missing
+	 * Close Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Close Parenthesis</em>' attribute.
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 */
 	void setMissingCloseParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Guard Open Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Guard Open Parenthesis</b></em>' attribute. The default value
+	 * is <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Guard Open Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Guard Open Parenthesis</em>' attribute isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Guard Open Parenthesis</em>' attribute.
 	 * @see #setMissingGuardOpenParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorTemplate_MissingGuardOpenParenthesis()
@@ -190,24 +198,25 @@
 	int getMissingGuardOpenParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingGuardOpenParenthesis <em>Missing Guard Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Guard Open Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingGuardOpenParenthesis
+	 * <em>Missing Guard Open Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Guard Open Parenthesis</em>' attribute.
 	 * @see #getMissingGuardOpenParenthesis()
 	 * @generated
 	 */
 	void setMissingGuardOpenParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Guard Close Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Guard Close Parenthesis</b></em>' attribute. The default value
+	 * is <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Guard Close Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Guard Close Parenthesis</em>' attribute isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Guard Close Parenthesis</em>' attribute.
 	 * @see #setMissingGuardCloseParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorTemplate_MissingGuardCloseParenthesis()
@@ -217,24 +226,25 @@
 	int getMissingGuardCloseParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingGuardCloseParenthesis <em>Missing Guard Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Guard Close Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingGuardCloseParenthesis
+	 * <em>Missing Guard Close Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Guard Close Parenthesis</em>' attribute.
 	 * @see #getMissingGuardCloseParenthesis()
 	 * @generated
 	 */
 	void setMissingGuardCloseParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Post Close Parenthesis</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Post Close Parenthesis</b></em>' attribute. The default value
+	 * is <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Post Close Parenthesis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Post Close Parenthesis</em>' attribute isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Post Close Parenthesis</em>' attribute.
 	 * @see #setMissingPostCloseParenthesis(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorTemplate_MissingPostCloseParenthesis()
@@ -244,24 +254,25 @@
 	int getMissingPostCloseParenthesis();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingPostCloseParenthesis <em>Missing Post Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Post Close Parenthesis</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingPostCloseParenthesis
+	 * <em>Missing Post Close Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Post Close Parenthesis</em>' attribute.
 	 * @see #getMissingPostCloseParenthesis()
 	 * @generated
 	 */
 	void setMissingPostCloseParenthesis(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End Header</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End Header</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End Header</em>' attribute.
 	 * @see #setMissingEndHeader(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorTemplate_MissingEndHeader()
@@ -271,24 +282,25 @@
 	int getMissingEndHeader();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingEndHeader <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End Header</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingEndHeader <em>Missing End
+	 * Header</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End Header</em>' attribute.
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 */
 	void setMissingEndHeader(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing End</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing End</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing End</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing End</em>' attribute.
 	 * @see #setMissingEnd(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorTemplate_MissingEnd()
@@ -298,10 +310,11 @@
 	int getMissingEnd();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingEnd <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing End</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorTemplate#getMissingEnd <em>Missing End</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing End</em>' attribute.
 	 * @see #getMissingEnd()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorVariable.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorVariable.java
index 2b9e903..78d8f7c 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorVariable.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ErrorVariable.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,17 +12,15 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error Variable</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Variable</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ErrorVariable#getMissingName <em>Missing Name</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorVariable#getMissingColon <em>Missing Colon</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ErrorVariable#getMissingType <em>Missing Type</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorVariable#getMissingName <em>Missing Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorVariable#getMissingColon <em>Missing Colon</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ErrorVariable#getMissingType <em>Missing Type</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getErrorVariable()
@@ -31,14 +29,14 @@
  */
 public interface ErrorVariable extends org.eclipse.acceleo.Error, Variable {
 	/**
-	 * Returns the value of the '<em><b>Missing Name</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Name</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Name</em>' attribute.
 	 * @see #setMissingName(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorVariable_MissingName()
@@ -48,24 +46,25 @@
 	int getMissingName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorVariable#getMissingName <em>Missing Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Name</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorVariable#getMissingName <em>Missing Name</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Name</em>' attribute.
 	 * @see #getMissingName()
 	 * @generated
 	 */
 	void setMissingName(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Colon</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Colon</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Colon</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Colon</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Colon</em>' attribute.
 	 * @see #setMissingColon(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorVariable_MissingColon()
@@ -75,24 +74,25 @@
 	int getMissingColon();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorVariable#getMissingColon <em>Missing Colon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Colon</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorVariable#getMissingColon <em>Missing
+	 * Colon</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Colon</em>' attribute.
 	 * @see #getMissingColon()
 	 * @generated
 	 */
 	void setMissingColon(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Missing Type</b></em>' attribute.
-	 * The default value is <code>"-1"</code>.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Missing Type</b></em>' attribute. The default value is
+	 * <code>"-1"</code>. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Missing Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Missing Type</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Missing Type</em>' attribute.
 	 * @see #setMissingType(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getErrorVariable_MissingType()
@@ -102,10 +102,11 @@
 	int getMissingType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorVariable#getMissingType <em>Missing Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Missing Type</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ErrorVariable#getMissingType <em>Missing Type</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Type</em>' attribute.
 	 * @see #getMissingType()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Expression.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Expression.java
index 51ebbc5..520606c 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Expression.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Expression.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,13 +16,12 @@
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Expression</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.Expression#getAst <em>Ast</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Expression#getAql <em>Aql</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Expression#getAst <em>Ast</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Expression#getAql <em>Aql</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getExpression()
@@ -31,13 +30,13 @@
  */
 public interface Expression extends ASTNode {
 	/**
-	 * Returns the value of the '<em><b>Ast</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Ast</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Ast</em>' attribute isn't clear, there really should be more of a
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ast</em>' attribute.
 	 * @see #setAst(AstResult)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getExpression_Ast()
@@ -47,19 +46,20 @@
 	AstResult getAst();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Expression#getAst <em>Ast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ast</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Expression#getAst <em>Ast</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Ast</em>' attribute.
 	 * @see #getAst()
 	 * @generated
 	 */
 	void setAst(AstResult value);
 
 	/**
-	 * Returns the value of the '<em><b>Aql</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the value of the '<em><b>Aql</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Aql</em>' containment reference.
 	 * @see #setAql(org.eclipse.acceleo.query.ast.Expression)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getExpression_Aql()
@@ -69,10 +69,11 @@
 	org.eclipse.acceleo.query.ast.Expression getAql();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Expression#getAql <em>Aql</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Aql</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Expression#getAql <em>Aql</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Aql</em>' containment reference.
 	 * @see #getAql()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ExpressionStatement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ExpressionStatement.java
index 034e661..8666eae 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ExpressionStatement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ExpressionStatement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,13 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Expression Statement</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Expression Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ExpressionStatement#getExpression <em>Expression</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ExpressionStatement#getExpression <em>Expression</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getExpressionStatement()
@@ -29,13 +27,13 @@
  */
 public interface ExpressionStatement extends LeafStatement {
 	/**
-	 * Returns the value of the '<em><b>Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Expression</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Expression</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Expression</em>' reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Expression</em>' containment reference.
 	 * @see #setExpression(Expression)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getExpressionStatement_Expression()
@@ -45,10 +43,11 @@
 	Expression getExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ExpressionStatement#getExpression <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expression</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ExpressionStatement#getExpression
+	 * <em>Expression</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Expression</em>' containment reference.
 	 * @see #getExpression()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/FileStatement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/FileStatement.java
index 4838607..8e58afe 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/FileStatement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/FileStatement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,18 +12,16 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>File Statement</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>File Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.FileStatement#getMode <em>Mode</em>}</li>
- *   <li>{@link org.eclipse.acceleo.FileStatement#getUrl <em>Url</em>}</li>
- *   <li>{@link org.eclipse.acceleo.FileStatement#getCharset <em>Charset</em>}</li>
- *   <li>{@link org.eclipse.acceleo.FileStatement#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.FileStatement#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.acceleo.FileStatement#getUrl <em>Url</em>}</li>
+ * <li>{@link org.eclipse.acceleo.FileStatement#getCharset <em>Charset</em>}</li>
+ * <li>{@link org.eclipse.acceleo.FileStatement#getBody <em>Body</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getFileStatement()
@@ -32,14 +30,14 @@
  */
 public interface FileStatement extends Statement {
 	/**
-	 * Returns the value of the '<em><b>Mode</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.acceleo.OpenModeKind}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Mode</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.acceleo.OpenModeKind}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Mode</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Mode</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Mode</em>' attribute.
 	 * @see org.eclipse.acceleo.OpenModeKind
 	 * @see #setMode(OpenModeKind)
@@ -50,10 +48,11 @@
 	OpenModeKind getMode();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.FileStatement#getMode <em>Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mode</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.FileStatement#getMode <em>Mode</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Mode</em>' attribute.
 	 * @see org.eclipse.acceleo.OpenModeKind
 	 * @see #getMode()
 	 * @generated
@@ -61,13 +60,13 @@
 	void setMode(OpenModeKind value);
 
 	/**
-	 * Returns the value of the '<em><b>Url</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Url</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Url</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Url</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Url</em>' containment reference.
 	 * @see #setUrl(Expression)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getFileStatement_Url()
@@ -77,23 +76,24 @@
 	Expression getUrl();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.FileStatement#getUrl <em>Url</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Url</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.FileStatement#getUrl <em>Url</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Url</em>' containment reference.
 	 * @see #getUrl()
 	 * @generated
 	 */
 	void setUrl(Expression value);
 
 	/**
-	 * Returns the value of the '<em><b>Charset</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Charset</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Charset</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Charset</em>' containment reference isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Charset</em>' containment reference.
 	 * @see #setCharset(Expression)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getFileStatement_Charset()
@@ -103,23 +103,24 @@
 	Expression getCharset();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.FileStatement#getCharset <em>Charset</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Charset</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.FileStatement#getCharset <em>Charset</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Charset</em>' containment reference.
 	 * @see #getCharset()
 	 * @generated
 	 */
 	void setCharset(Expression value);
 
 	/**
-	 * Returns the value of the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Body</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Body</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Body</em>' containment reference.
 	 * @see #setBody(Block)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getFileStatement_Body()
@@ -129,10 +130,11 @@
 	Block getBody();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.FileStatement#getBody <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Body</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.FileStatement#getBody <em>Body</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Body</em>' containment reference.
 	 * @see #getBody()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ForStatement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ForStatement.java
index de149c2..b690232 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ForStatement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ForStatement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,17 +12,15 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>For Statement</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>For Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ForStatement#getBinding <em>Binding</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ForStatement#getSeparator <em>Separator</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ForStatement#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ForStatement#getBinding <em>Binding</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ForStatement#getSeparator <em>Separator</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ForStatement#getBody <em>Body</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getForStatement()
@@ -31,13 +29,13 @@
  */
 public interface ForStatement extends Statement {
 	/**
-	 * Returns the value of the '<em><b>Binding</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Binding</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Binding</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Binding</em>' containment reference isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Binding</em>' containment reference.
 	 * @see #setBinding(Binding)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getForStatement_Binding()
@@ -47,19 +45,20 @@
 	Binding getBinding();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ForStatement#getBinding <em>Binding</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Binding</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ForStatement#getBinding <em>Binding</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Binding</em>' containment reference.
 	 * @see #getBinding()
 	 * @generated
 	 */
 	void setBinding(Binding value);
 
 	/**
-	 * Returns the value of the '<em><b>Separator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Separator</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Separator</em>' containment reference.
 	 * @see #setSeparator(Expression)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getForStatement_Separator()
@@ -69,23 +68,24 @@
 	Expression getSeparator();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ForStatement#getSeparator <em>Separator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Separator</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ForStatement#getSeparator <em>Separator</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Separator</em>' containment reference.
 	 * @see #getSeparator()
 	 * @generated
 	 */
 	void setSeparator(Expression value);
 
 	/**
-	 * Returns the value of the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Body</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Body</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Body</em>' containment reference.
 	 * @see #setBody(Block)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getForStatement_Body()
@@ -95,10 +95,11 @@
 	Block getBody();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ForStatement#getBody <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Body</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ForStatement#getBody <em>Body</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Body</em>' containment reference.
 	 * @see #getBody()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/IfStatement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/IfStatement.java
index 1cffe15..4271660 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/IfStatement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/IfStatement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,17 +12,15 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>If Statement</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>If Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.IfStatement#getCondition <em>Condition</em>}</li>
- *   <li>{@link org.eclipse.acceleo.IfStatement#getThen <em>Then</em>}</li>
- *   <li>{@link org.eclipse.acceleo.IfStatement#getElse <em>Else</em>}</li>
+ * <li>{@link org.eclipse.acceleo.IfStatement#getCondition <em>Condition</em>}</li>
+ * <li>{@link org.eclipse.acceleo.IfStatement#getThen <em>Then</em>}</li>
+ * <li>{@link org.eclipse.acceleo.IfStatement#getElse <em>Else</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getIfStatement()
@@ -31,13 +29,13 @@
  */
 public interface IfStatement extends Statement {
 	/**
-	 * Returns the value of the '<em><b>Condition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Condition</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Condition</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Condition</em>' containment reference isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Condition</em>' containment reference.
 	 * @see #setCondition(Expression)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getIfStatement_Condition()
@@ -47,23 +45,24 @@
 	Expression getCondition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.IfStatement#getCondition <em>Condition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Condition</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.IfStatement#getCondition <em>Condition</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Condition</em>' containment reference.
 	 * @see #getCondition()
 	 * @generated
 	 */
 	void setCondition(Expression value);
 
 	/**
-	 * Returns the value of the '<em><b>Then</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Then</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Then</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Then</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Then</em>' containment reference.
 	 * @see #setThen(Block)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getIfStatement_Then()
@@ -73,23 +72,24 @@
 	Block getThen();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.IfStatement#getThen <em>Then</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Then</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.IfStatement#getThen <em>Then</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Then</em>' containment reference.
 	 * @see #getThen()
 	 * @generated
 	 */
 	void setThen(Block value);
 
 	/**
-	 * Returns the value of the '<em><b>Else</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Else</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Else</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Else</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Else</em>' containment reference.
 	 * @see #setElse(Block)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getIfStatement_Else()
@@ -99,10 +99,11 @@
 	Block getElse();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.IfStatement#getElse <em>Else</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Else</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.IfStatement#getElse <em>Else</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Else</em>' containment reference.
 	 * @see #getElse()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Import.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Import.java
index 455b47c..654d67e 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Import.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Import.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,13 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Import</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Import</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.Import#getModule <em>Module</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Import#getModule <em>Module</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getImport()
@@ -30,13 +28,13 @@
 public interface Import extends ASTNode {
 
 	/**
-	 * Returns the value of the '<em><b>Module</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Module</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Module</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Module</em>' containment reference isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Module</em>' containment reference.
 	 * @see #setModule(ModuleReference)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getImport_Module()
@@ -46,10 +44,11 @@
 	ModuleReference getModule();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Import#getModule <em>Module</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Module</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Import#getModule <em>Module</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Module</em>' containment reference.
 	 * @see #getModule()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/LeafStatement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/LeafStatement.java
index 9efe5b5..ed90cb2 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/LeafStatement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/LeafStatement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,13 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Leaf Statement</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Leaf Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.LeafStatement#isNewLineNeeded <em>New Line Needed</em>}</li>
+ * <li>{@link org.eclipse.acceleo.LeafStatement#isNewLineNeeded <em>New Line Needed</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getLeafStatement()
@@ -29,9 +27,9 @@
  */
 public interface LeafStatement extends Statement {
 	/**
-	 * Returns the value of the '<em><b>New Line Needed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the value of the '<em><b>New Line Needed</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the value of the '<em>New Line Needed</em>' attribute.
 	 * @see #setNewLineNeeded(boolean)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getLeafStatement_NewLineNeeded()
@@ -41,10 +39,11 @@
 	boolean isNewLineNeeded();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.LeafStatement#isNewLineNeeded <em>New Line Needed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>New Line Needed</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.LeafStatement#isNewLineNeeded <em>New Line
+	 * Needed</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>New Line Needed</em>' attribute.
 	 * @see #isNewLineNeeded()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/LetStatement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/LetStatement.java
index ca6be1d..aff3d71 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/LetStatement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/LetStatement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,16 +14,14 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Let Statement</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Let Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.LetStatement#getVariables <em>Variables</em>}</li>
- *   <li>{@link org.eclipse.acceleo.LetStatement#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.LetStatement#getVariables <em>Variables</em>}</li>
+ * <li>{@link org.eclipse.acceleo.LetStatement#getBody <em>Body</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getLetStatement()
@@ -32,14 +30,14 @@
  */
 public interface LetStatement extends Statement {
 	/**
-	 * Returns the value of the '<em><b>Variables</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.acceleo.Binding}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Variables</b></em>' containment reference list. The list contents are
+	 * of type {@link org.eclipse.acceleo.Binding}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Variables</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Variables</em>' containment reference list isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Variables</em>' containment reference list.
 	 * @see org.eclipse.acceleo.AcceleoPackage#getLetStatement_Variables()
 	 * @model containment="true" required="true"
@@ -48,13 +46,13 @@
 	EList<Binding> getVariables();
 
 	/**
-	 * Returns the value of the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Body</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Body</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Body</em>' containment reference.
 	 * @see #setBody(Block)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getLetStatement_Body()
@@ -64,10 +62,11 @@
 	Block getBody();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.LetStatement#getBody <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Body</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.LetStatement#getBody <em>Body</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Body</em>' containment reference.
 	 * @see #getBody()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Metamodel.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Metamodel.java
index 0545a27..b95fd74 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Metamodel.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Metamodel.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,15 +14,13 @@
 import org.eclipse.emf.ecore.EPackage;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Metamodel</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Metamodel</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.Metamodel#getReferencedPackage <em>Referenced Package</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Metamodel#getReferencedPackage <em>Referenced Package</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getMetamodel()
@@ -31,13 +29,13 @@
  */
 public interface Metamodel extends ASTNode {
 	/**
-	 * Returns the value of the '<em><b>Referenced Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Referenced Package</b></em>' reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Referenced Package</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Referenced Package</em>' reference isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Referenced Package</em>' reference.
 	 * @see #setReferencedPackage(EPackage)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getMetamodel_ReferencedPackage()
@@ -47,10 +45,11 @@
 	EPackage getReferencedPackage();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Metamodel#getReferencedPackage <em>Referenced Package</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Referenced Package</em>' reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Metamodel#getReferencedPackage <em>Referenced
+	 * Package</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Referenced Package</em>' reference.
 	 * @see #getReferencedPackage()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Module.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Module.java
index 67320e3..652af59 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Module.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Module.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -15,21 +15,19 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Module</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Module</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.Module#getMetamodels <em>Metamodels</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Module#getExtends <em>Extends</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Module#getImports <em>Imports</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Module#getModuleElements <em>Module Elements</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Module#getStartHeaderPosition <em>Start Header Position</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Module#getEndHeaderPosition <em>End Header Position</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Module#getAst <em>Ast</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Module#getMetamodels <em>Metamodels</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Module#getExtends <em>Extends</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Module#getImports <em>Imports</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Module#getModuleElements <em>Module Elements</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Module#getStartHeaderPosition <em>Start Header Position</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Module#getEndHeaderPosition <em>End Header Position</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Module#getAst <em>Ast</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getModule()
@@ -38,14 +36,14 @@
  */
 public interface Module extends NamedElement, DocumentedElement, ASTNode {
 	/**
-	 * Returns the value of the '<em><b>Metamodels</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.acceleo.Metamodel}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Metamodels</b></em>' reference list. The list contents are of type
+	 * {@link org.eclipse.acceleo.Metamodel}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Metamodels</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Metamodels</em>' reference list isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Metamodels</em>' reference list.
 	 * @see org.eclipse.acceleo.AcceleoPackage#getModule_Metamodels()
 	 * @model required="true"
@@ -54,13 +52,13 @@
 	EList<Metamodel> getMetamodels();
 
 	/**
-	 * Returns the value of the '<em><b>Extends</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Extends</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Extends</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Extends</em>' containment reference list isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Extends</em>' containment reference.
 	 * @see #setExtends(ModuleReference)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getModule_Extends()
@@ -70,24 +68,25 @@
 	ModuleReference getExtends();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Module#getExtends <em>Extends</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Extends</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Module#getExtends <em>Extends</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Extends</em>' containment reference.
 	 * @see #getExtends()
 	 * @generated
 	 */
 	void setExtends(ModuleReference value);
 
 	/**
-	 * Returns the value of the '<em><b>Imports</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.acceleo.Import}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Imports</b></em>' containment reference list. The list contents are of
+	 * type {@link org.eclipse.acceleo.Import}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Imports</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Imports</em>' containment reference list isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Imports</em>' containment reference list.
 	 * @see org.eclipse.acceleo.AcceleoPackage#getModule_Imports()
 	 * @model containment="true"
@@ -96,14 +95,14 @@
 	EList<Import> getImports();
 
 	/**
-	 * Returns the value of the '<em><b>Module Elements</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.acceleo.ModuleElement}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Module Elements</b></em>' containment reference list. The list
+	 * contents are of type {@link org.eclipse.acceleo.ModuleElement}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Module Elements</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Module Elements</em>' containment reference list isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Module Elements</em>' containment reference list.
 	 * @see org.eclipse.acceleo.AcceleoPackage#getModule_ModuleElements()
 	 * @model containment="true" required="true"
@@ -112,13 +111,13 @@
 	EList<ModuleElement> getModuleElements();
 
 	/**
-	 * Returns the value of the '<em><b>Start Header Position</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Start Header Position</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Start Header Position</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Start Header Position</em>' attribute isn't clear, there really should be
+	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Start Header Position</em>' attribute.
 	 * @see #setStartHeaderPosition(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getModule_StartHeaderPosition()
@@ -128,23 +127,24 @@
 	int getStartHeaderPosition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Module#getStartHeaderPosition <em>Start Header Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start Header Position</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Module#getStartHeaderPosition <em>Start Header
+	 * Position</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Start Header Position</em>' attribute.
 	 * @see #getStartHeaderPosition()
 	 * @generated
 	 */
 	void setStartHeaderPosition(int value);
 
 	/**
-	 * Returns the value of the '<em><b>End Header Position</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>End Header Position</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>End Header Position</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>End Header Position</em>' attribute isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>End Header Position</em>' attribute.
 	 * @see #setEndHeaderPosition(int)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getModule_EndHeaderPosition()
@@ -154,19 +154,19 @@
 	int getEndHeaderPosition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Module#getEndHeaderPosition <em>End Header Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>End Header Position</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Module#getEndHeaderPosition <em>End Header
+	 * Position</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>End Header Position</em>' attribute.
 	 * @see #getEndHeaderPosition()
 	 * @generated
 	 */
 	void setEndHeaderPosition(int value);
 
 	/**
-	 * Returns the value of the '<em><b>Ast</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the value of the '<em><b>Ast</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Ast</em>' attribute.
 	 * @see #setAst(AcceleoAstResult)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getModule_Ast()
@@ -176,10 +176,11 @@
 	AcceleoAstResult getAst();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Module#getAst <em>Ast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ast</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Module#getAst <em>Ast</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Ast</em>' attribute.
 	 * @see #getAst()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleDocumentation.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleDocumentation.java
index 1a97f92..f02f43e 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleDocumentation.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleDocumentation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,17 +12,15 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Module Documentation</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Module Documentation</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ModuleDocumentation#getAuthor <em>Author</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ModuleDocumentation#getVersion <em>Version</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ModuleDocumentation#getSince <em>Since</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ModuleDocumentation#getAuthor <em>Author</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ModuleDocumentation#getVersion <em>Version</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ModuleDocumentation#getSince <em>Since</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getModuleDocumentation()
@@ -31,13 +29,13 @@
  */
 public interface ModuleDocumentation extends Documentation {
 	/**
-	 * Returns the value of the '<em><b>Author</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Author</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Author</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Author</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Author</em>' attribute.
 	 * @see #setAuthor(String)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getModuleDocumentation_Author()
@@ -47,23 +45,24 @@
 	String getAuthor();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ModuleDocumentation#getAuthor <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Author</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ModuleDocumentation#getAuthor <em>Author</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Author</em>' attribute.
 	 * @see #getAuthor()
 	 * @generated
 	 */
 	void setAuthor(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Version</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Version</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Version</em>' attribute.
 	 * @see #setVersion(String)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getModuleDocumentation_Version()
@@ -73,23 +72,24 @@
 	String getVersion();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ModuleDocumentation#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ModuleDocumentation#getVersion <em>Version</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Version</em>' attribute.
 	 * @see #getVersion()
 	 * @generated
 	 */
 	void setVersion(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Since</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Since</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Since</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Since</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Since</em>' attribute.
 	 * @see #setSince(String)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getModuleDocumentation_Since()
@@ -99,10 +99,11 @@
 	String getSince();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ModuleDocumentation#getSince <em>Since</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Since</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ModuleDocumentation#getSince <em>Since</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Since</em>' attribute.
 	 * @see #getSince()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleElement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleElement.java
index 5cde0b4..dc554b6 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleElement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleElement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,10 +12,8 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Module Element</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Module Element</b></em>'. <!--
+ * end-user-doc -->
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getModuleElement()
  * @model abstract="true"
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleElementDocumentation.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleElementDocumentation.java
index ffdff87..cd0e3d4 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleElementDocumentation.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleElementDocumentation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,15 +14,14 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Module Element Documentation</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Module Element
+ * Documentation</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ModuleElementDocumentation#getParameterDocumentation <em>Parameter Documentation</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ModuleElementDocumentation#getParameterDocumentation <em>Parameter
+ * Documentation</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getModuleElementDocumentation()
@@ -31,14 +30,14 @@
  */
 public interface ModuleElementDocumentation extends Documentation {
 	/**
-	 * Returns the value of the '<em><b>Parameter Documentation</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.acceleo.ParameterDocumentation}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Parameter Documentation</b></em>' containment reference list. The list
+	 * contents are of type {@link org.eclipse.acceleo.ParameterDocumentation}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Parameter Documentation</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Parameter Documentation</em>' containment reference list isn't clear, there
+	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Parameter Documentation</em>' containment reference list.
 	 * @see org.eclipse.acceleo.AcceleoPackage#getModuleElementDocumentation_ParameterDocumentation()
 	 * @model containment="true"
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleReference.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleReference.java
index 0ea8a72..531cb67 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleReference.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ModuleReference.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,13 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Module Reference</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Module Reference</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ModuleReference#getQualifiedName <em>Qualified Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ModuleReference#getQualifiedName <em>Qualified Name</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getModuleReference()
@@ -29,13 +27,13 @@
  */
 public interface ModuleReference extends ASTNode {
 	/**
-	 * Returns the value of the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Qualified Name</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Qualified Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Qualified Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Qualified Name</em>' attribute.
 	 * @see #setQualifiedName(String)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getModuleReference_QualifiedName()
@@ -45,10 +43,11 @@
 	String getQualifiedName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ModuleReference#getQualifiedName <em>Qualified Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Qualified Name</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ModuleReference#getQualifiedName <em>Qualified
+	 * Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Qualified Name</em>' attribute.
 	 * @see #getQualifiedName()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/NamedElement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/NamedElement.java
index 3ea10fe..178a90b 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/NamedElement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/NamedElement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,15 +14,13 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Named Element</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Named Element</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.NamedElement#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.NamedElement#getName <em>Name</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getNamedElement()
@@ -31,13 +29,13 @@
  */
 public interface NamedElement extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getNamedElement_Name()
@@ -47,10 +45,11 @@
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.NamedElement#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.NamedElement#getName <em>Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/NewLineStatement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/NewLineStatement.java
index 7ea32ab..3e30f64 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/NewLineStatement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/NewLineStatement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,13 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>New Line Statement</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>New Line Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.NewLineStatement#isIndentationNeeded <em>Indentation Needed</em>}</li>
+ * <li>{@link org.eclipse.acceleo.NewLineStatement#isIndentationNeeded <em>Indentation Needed</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getNewLineStatement()
@@ -29,9 +27,9 @@
  */
 public interface NewLineStatement extends TextStatement {
 	/**
-	 * Returns the value of the '<em><b>Indentation Needed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the value of the '<em><b>Indentation Needed</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Indentation Needed</em>' attribute.
 	 * @see #setIndentationNeeded(boolean)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getNewLineStatement_IndentationNeeded()
@@ -41,10 +39,11 @@
 	boolean isIndentationNeeded();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.NewLineStatement#isIndentationNeeded <em>Indentation Needed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Indentation Needed</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.NewLineStatement#isIndentationNeeded <em>Indentation
+	 * Needed</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Indentation Needed</em>' attribute.
 	 * @see #isIndentationNeeded()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/OpenModeKind.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/OpenModeKind.java
index a91f7e6..6e23411 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/OpenModeKind.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/OpenModeKind.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -18,19 +18,17 @@
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Open Mode Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Open Mode
+ * Kind</b></em>', and utility methods for working with them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.acceleo.AcceleoPackage#getOpenModeKind()
  * @model
  * @generated
  */
 public enum OpenModeKind implements Enumerator {
 	/**
-	 * The '<em><b>Overwrite</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Overwrite</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #OVERWRITE_VALUE
 	 * @generated
 	 * @ordered
@@ -38,9 +36,8 @@
 	OVERWRITE(0, "overwrite", "overwrite"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Append</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Append</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #APPEND_VALUE
 	 * @generated
 	 * @ordered
@@ -48,9 +45,8 @@
 	APPEND(1, "append", "append"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Create</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Create</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #CREATE_VALUE
 	 * @generated
 	 * @ordered
@@ -58,13 +54,13 @@
 	CREATE(2, "create", "create"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Overwrite</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Overwrite</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Overwrite</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Overwrite</b></em>' literal object isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OVERWRITE
 	 * @model name="overwrite"
 	 * @generated
@@ -73,13 +69,13 @@
 	public static final int OVERWRITE_VALUE = 0;
 
 	/**
-	 * The '<em><b>Append</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Append</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Append</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Append</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #APPEND
 	 * @model name="append"
 	 * @generated
@@ -88,13 +84,13 @@
 	public static final int APPEND_VALUE = 1;
 
 	/**
-	 * The '<em><b>Create</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Create</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Create</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Create</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #CREATE
 	 * @model name="create"
 	 * @generated
@@ -103,26 +99,27 @@
 	public static final int CREATE_VALUE = 2;
 
 	/**
-	 * An array of all the '<em><b>Open Mode Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Open Mode Kind</b></em>' enumerators. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static final OpenModeKind[] VALUES_ARRAY = new OpenModeKind[] {OVERWRITE, APPEND, CREATE, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Open Mode Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Open Mode Kind</b></em>' enumerators. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<OpenModeKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Open Mode Kind</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
+	 * Returns the '<em><b>Open Mode Kind</b></em>' literal with the specified literal value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal
+	 *            the literal.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
@@ -137,10 +134,11 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Open Mode Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
+	 * Returns the '<em><b>Open Mode Kind</b></em>' literal with the specified name. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param name the name.
+	 * 
+	 * @param name
+	 *            the name.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
@@ -155,10 +153,11 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Open Mode Kind</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
+	 * Returns the '<em><b>Open Mode Kind</b></em>' literal with the specified integer value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the integer value.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
@@ -175,30 +174,29 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private OpenModeKind(int value, String name, String literal) {
@@ -208,8 +206,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -218,8 +216,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -228,8 +226,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,9 +236,9 @@
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -248,4 +246,4 @@
 		return literal;
 	}
 
-} //OpenModeKind
+} // OpenModeKind
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ParameterDocumentation.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ParameterDocumentation.java
index cb8ffe6..8f30184 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ParameterDocumentation.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ParameterDocumentation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,11 +12,9 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parameter Documentation</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Parameter Documentation</b></em>'.
  * <!-- end-user-doc -->
  *
- *
  * @see org.eclipse.acceleo.AcceleoPackage#getParameterDocumentation()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ProtectedArea.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ProtectedArea.java
index b48638f..ab350b8 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ProtectedArea.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/ProtectedArea.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,16 +12,14 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Protected Area</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Protected Area</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.ProtectedArea#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.acceleo.ProtectedArea#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ProtectedArea#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.acceleo.ProtectedArea#getBody <em>Body</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getProtectedArea()
@@ -30,13 +28,13 @@
  */
 public interface ProtectedArea extends Statement {
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Id</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Id</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Id</em>' containment reference.
 	 * @see #setId(Expression)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getProtectedArea_Id()
@@ -46,23 +44,24 @@
 	Expression getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ProtectedArea#getId <em>Id</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ProtectedArea#getId <em>Id</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Id</em>' containment reference.
 	 * @see #getId()
 	 * @generated
 	 */
 	void setId(Expression value);
 
 	/**
-	 * Returns the value of the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Body</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Body</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Body</em>' containment reference.
 	 * @see #setBody(Block)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getProtectedArea_Body()
@@ -72,10 +71,11 @@
 	Block getBody();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.ProtectedArea#getBody <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Body</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.ProtectedArea#getBody <em>Body</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Body</em>' containment reference.
 	 * @see #getBody()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Query.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Query.java
index 1a226d6..fd1ee11 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Query.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Query.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,17 +14,14 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Query</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Query</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.Query#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Query#getVisibility <em>Visibility</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Query#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Query#getParameters <em>Parameters</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Query#getVisibility <em>Visibility</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Query#getBody <em>Body</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getQuery()
@@ -33,14 +30,14 @@
  */
 public interface Query extends ModuleElement, DocumentedElement, NamedElement, TypedElement {
 	/**
-	 * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.acceleo.Variable}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Parameters</b></em>' containment reference list. The list contents are
+	 * of type {@link org.eclipse.acceleo.Variable}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Parameters</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Parameters</em>' containment reference list isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Parameters</em>' containment reference list.
 	 * @see org.eclipse.acceleo.AcceleoPackage#getQuery_Parameters()
 	 * @model containment="true" required="true"
@@ -49,14 +46,14 @@
 	EList<Variable> getParameters();
 
 	/**
-	 * Returns the value of the '<em><b>Visibility</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.acceleo.VisibilityKind}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Visibility</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.acceleo.VisibilityKind}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Visibility</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Visibility</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Visibility</em>' attribute.
 	 * @see org.eclipse.acceleo.VisibilityKind
 	 * @see #setVisibility(VisibilityKind)
@@ -68,9 +65,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.acceleo.Query#getVisibility <em>Visibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Visibility</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Visibility</em>' attribute.
 	 * @see org.eclipse.acceleo.VisibilityKind
 	 * @see #getVisibility()
 	 * @generated
@@ -78,13 +76,13 @@
 	void setVisibility(VisibilityKind value);
 
 	/**
-	 * Returns the value of the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Body</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Body</em>' reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Body</em>' containment reference.
 	 * @see #setBody(Expression)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getQuery_Body()
@@ -95,9 +93,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.acceleo.Query#getBody <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Body</em>' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Body</em>' containment reference.
 	 * @see #getBody()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Statement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Statement.java
index 601a4b6..1076f3d 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Statement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Statement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,10 +12,8 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Statement</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Statement</b></em>'. <!-- end-user-doc
+ * -->
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getStatement()
  * @model interface="true" abstract="true"
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Template.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Template.java
index cd126f3..80fc687 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Template.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Template.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,20 +14,18 @@
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Template</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Template</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.Template#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Template#getGuard <em>Guard</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Template#getPost <em>Post</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Template#isMain <em>Main</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Template#getVisibility <em>Visibility</em>}</li>
- *   <li>{@link org.eclipse.acceleo.Template#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Template#getParameters <em>Parameters</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Template#getGuard <em>Guard</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Template#getPost <em>Post</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Template#isMain <em>Main</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Template#getVisibility <em>Visibility</em>}</li>
+ * <li>{@link org.eclipse.acceleo.Template#getBody <em>Body</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getTemplate()
@@ -36,14 +34,14 @@
  */
 public interface Template extends ModuleElement, DocumentedElement, NamedElement {
 	/**
-	 * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.acceleo.Variable}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Parameters</b></em>' containment reference list. The list contents are
+	 * of type {@link org.eclipse.acceleo.Variable}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Parameters</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Parameters</em>' containment reference list isn't clear, there really should
+	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Parameters</em>' containment reference list.
 	 * @see org.eclipse.acceleo.AcceleoPackage#getTemplate_Parameters()
 	 * @model containment="true" required="true"
@@ -52,13 +50,13 @@
 	EList<Variable> getParameters();
 
 	/**
-	 * Returns the value of the '<em><b>Guard</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Guard</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Guard</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Guard</em>' containment reference isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Guard</em>' containment reference.
 	 * @see #setGuard(Expression)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getTemplate_Guard()
@@ -68,23 +66,24 @@
 	Expression getGuard();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Template#getGuard <em>Guard</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Guard</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Template#getGuard <em>Guard</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Guard</em>' containment reference.
 	 * @see #getGuard()
 	 * @generated
 	 */
 	void setGuard(Expression value);
 
 	/**
-	 * Returns the value of the '<em><b>Post</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Post</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Post</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Post</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Post</em>' containment reference.
 	 * @see #setPost(Expression)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getTemplate_Post()
@@ -94,24 +93,25 @@
 	Expression getPost();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Template#getPost <em>Post</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Post</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Template#getPost <em>Post</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Post</em>' containment reference.
 	 * @see #getPost()
 	 * @generated
 	 */
 	void setPost(Expression value);
 
 	/**
-	 * Returns the value of the '<em><b>Main</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
+	 * Returns the value of the '<em><b>Main</b></em>' attribute. The default value is <code>"false"</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Main</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Main</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Main</em>' attribute.
 	 * @see #setMain(boolean)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getTemplate_Main()
@@ -121,24 +121,25 @@
 	boolean isMain();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Template#isMain <em>Main</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Main</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Template#isMain <em>Main</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Main</em>' attribute.
 	 * @see #isMain()
 	 * @generated
 	 */
 	void setMain(boolean value);
 
 	/**
-	 * Returns the value of the '<em><b>Visibility</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.acceleo.VisibilityKind}.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Visibility</b></em>' attribute. The literals are from the enumeration
+	 * {@link org.eclipse.acceleo.VisibilityKind}. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Visibility</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Visibility</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Visibility</em>' attribute.
 	 * @see org.eclipse.acceleo.VisibilityKind
 	 * @see #setVisibility(VisibilityKind)
@@ -149,10 +150,11 @@
 	VisibilityKind getVisibility();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Template#getVisibility <em>Visibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Visibility</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Template#getVisibility <em>Visibility</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Visibility</em>' attribute.
 	 * @see org.eclipse.acceleo.VisibilityKind
 	 * @see #getVisibility()
 	 * @generated
@@ -160,13 +162,13 @@
 	void setVisibility(VisibilityKind value);
 
 	/**
-	 * Returns the value of the '<em><b>Body</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Body</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Body</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Body</em>' containment reference isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Body</em>' containment reference.
 	 * @see #setBody(Block)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getTemplate_Body()
@@ -176,10 +178,11 @@
 	Block getBody();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.Template#getBody <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Body</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.Template#getBody <em>Body</em>}' containment
+	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Body</em>' containment reference.
 	 * @see #getBody()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/TextStatement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/TextStatement.java
index 16cb08d..493dd4a 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/TextStatement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/TextStatement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,15 +12,13 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Text Statement</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Text Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.TextStatement#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.acceleo.TextStatement#getValue <em>Value</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getTextStatement()
@@ -29,13 +27,13 @@
  */
 public interface TextStatement extends LeafStatement {
 	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getTextStatement_Value()
@@ -46,9 +44,10 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.acceleo.TextStatement#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/TypedElement.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/TypedElement.java
index 10769b3..206990a 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/TypedElement.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/TypedElement.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,16 +16,14 @@
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Typed Element</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Typed Element</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.TypedElement#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.acceleo.TypedElement#getTypeAql <em>Type Aql</em>}</li>
+ * <li>{@link org.eclipse.acceleo.TypedElement#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.acceleo.TypedElement#getTypeAql <em>Type Aql</em>}</li>
  * </ul>
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getTypedElement()
@@ -34,13 +32,13 @@
  */
 public interface TypedElement extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Type</em>' reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see #setType(AstResult)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getTypedElement_Type()
@@ -50,19 +48,20 @@
 	AstResult getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.TypedElement#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.acceleo.TypedElement#getType <em>Type</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type</em>' attribute.
 	 * @see #getType()
 	 * @generated
 	 */
 	void setType(AstResult value);
 
 	/**
-	 * Returns the value of the '<em><b>Type Aql</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the value of the '<em><b>Type Aql</b></em>' containment reference. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Type Aql</em>' containment reference.
 	 * @see #setTypeAql(Expression)
 	 * @see org.eclipse.acceleo.AcceleoPackage#getTypedElement_TypeAql()
@@ -72,10 +71,11 @@
 	Expression getTypeAql();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.TypedElement#getTypeAql <em>Type Aql</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type Aql</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.acceleo.TypedElement#getTypeAql <em>Type Aql</em>}'
+	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Type Aql</em>' containment reference.
 	 * @see #getTypeAql()
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Variable.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Variable.java
index ea77d19..19bb0ac 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Variable.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/Variable.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,10 +12,8 @@
 package org.eclipse.acceleo;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Variable</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Variable</b></em>'. <!-- end-user-doc
+ * -->
  *
  * @see org.eclipse.acceleo.AcceleoPackage#getVariable()
  * @model
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/VisibilityKind.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/VisibilityKind.java
index 2a6781d..6a00448 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/VisibilityKind.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/VisibilityKind.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -18,19 +18,17 @@
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Visibility Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Visibility
+ * Kind</b></em>', and utility methods for working with them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.acceleo.AcceleoPackage#getVisibilityKind()
  * @model
  * @generated
  */
 public enum VisibilityKind implements Enumerator {
 	/**
-	 * The '<em><b>Private</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Private</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #PRIVATE_VALUE
 	 * @generated
 	 * @ordered
@@ -38,9 +36,8 @@
 	PRIVATE(0, "private", "private"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Protected</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Protected</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #PROTECTED_VALUE
 	 * @generated
 	 * @ordered
@@ -48,9 +45,8 @@
 	PROTECTED(1, "protected", "protected"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Public</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The '<em><b>Public</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #PUBLIC_VALUE
 	 * @generated
 	 * @ordered
@@ -58,13 +54,13 @@
 	PUBLIC(2, "public", "public"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
-	 * The '<em><b>Private</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Private</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Private</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Private</b></em>' literal object isn't clear, there really should be more of
+	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #PRIVATE
 	 * @model name="private"
 	 * @generated
@@ -73,13 +69,13 @@
 	public static final int PRIVATE_VALUE = 0;
 
 	/**
-	 * The '<em><b>Protected</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Protected</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Protected</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Protected</b></em>' literal object isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #PROTECTED
 	 * @model name="protected"
 	 * @generated
@@ -88,13 +84,13 @@
 	public static final int PROTECTED_VALUE = 1;
 
 	/**
-	 * The '<em><b>Public</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+	 * The '<em><b>Public</b></em>' literal value. <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Public</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Public</b></em>' literal object isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #PUBLIC
 	 * @model name="public"
 	 * @generated
@@ -103,27 +99,28 @@
 	public static final int PUBLIC_VALUE = 2;
 
 	/**
-	 * An array of all the '<em><b>Visibility Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * An array of all the '<em><b>Visibility Kind</b></em>' enumerators. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static final VisibilityKind[] VALUES_ARRAY = new VisibilityKind[] {PRIVATE, PROTECTED, PUBLIC, };
 
 	/**
-	 * A public read-only list of all the '<em><b>Visibility Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A public read-only list of all the '<em><b>Visibility Kind</b></em>' enumerators. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<VisibilityKind> VALUES = Collections.unmodifiableList(Arrays.asList(
 			VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Visibility Kind</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
+	 * Returns the '<em><b>Visibility Kind</b></em>' literal with the specified literal value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param literal
+	 *            the literal.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
@@ -138,10 +135,11 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Visibility Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
+	 * Returns the '<em><b>Visibility Kind</b></em>' literal with the specified name. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param name the name.
+	 * 
+	 * @param name
+	 *            the name.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
@@ -156,10 +154,11 @@
 	}
 
 	/**
-	 * Returns the '<em><b>Visibility Kind</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
+	 * Returns the '<em><b>Visibility Kind</b></em>' literal with the specified integer value. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the integer value.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
@@ -176,30 +175,29 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private VisibilityKind(int value, String name, String literal) {
@@ -209,8 +207,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -219,8 +217,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -229,8 +227,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -239,9 +237,9 @@
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -249,4 +247,4 @@
 		return literal;
 	}
 
-} //VisibilityKind
+} // VisibilityKind
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/AcceleoFactoryImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/AcceleoFactoryImpl.java
index bb71155..efd0ee2 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/AcceleoFactoryImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/AcceleoFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -65,22 +65,18 @@
 import org.eclipse.emf.ecore.EDataType;
 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;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class AcceleoFactoryImpl extends EFactoryImpl implements AcceleoFactory {
 	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static AcceleoFactory init() {
@@ -97,9 +93,8 @@
 	}
 
 	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AcceleoFactoryImpl() {
@@ -107,8 +102,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -211,8 +206,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -235,8 +230,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -259,8 +254,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -270,8 +265,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -281,8 +276,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -292,8 +287,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -303,8 +298,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -314,8 +309,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -325,8 +320,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -336,8 +331,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -347,8 +342,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -358,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -369,8 +364,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -380,8 +375,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -391,8 +386,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -402,8 +397,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -413,8 +408,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -424,8 +419,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -435,8 +430,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -446,8 +441,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -457,8 +452,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -468,8 +463,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -479,8 +474,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -490,8 +485,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -501,8 +496,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -512,8 +507,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -523,8 +518,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -534,8 +529,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -545,8 +540,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -556,8 +551,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -567,8 +562,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -578,8 +573,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -589,8 +584,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -600,8 +595,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -611,8 +606,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -622,8 +617,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -633,8 +628,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -644,8 +639,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -655,8 +650,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -666,8 +661,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -677,8 +672,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -688,8 +683,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -699,8 +694,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -710,8 +705,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -721,8 +716,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -732,8 +727,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -743,8 +738,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -754,8 +749,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public VisibilityKind createVisibilityKindFromString(EDataType eDataType, String initialValue) {
@@ -767,8 +762,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertVisibilityKindToString(EDataType eDataType, Object instanceValue) {
@@ -776,8 +771,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public OpenModeKind createOpenModeKindFromString(EDataType eDataType, String initialValue) {
@@ -789,8 +784,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertOpenModeKindToString(EDataType eDataType, Object instanceValue) {
@@ -798,8 +793,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AstResult createASTResultFromString(EDataType eDataType, String initialValue) {
@@ -807,8 +802,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertASTResultToString(EDataType eDataType, Object instanceValue) {
@@ -816,8 +811,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String createModuleQualifiedNameFromString(EDataType eDataType, String initialValue) {
@@ -825,8 +820,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertModuleQualifiedNameToString(EDataType eDataType, Object instanceValue) {
@@ -834,8 +829,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AcceleoAstResult createAcceleoAstResultFromString(EDataType eDataType, String initialValue) {
@@ -843,8 +838,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertAcceleoAstResultToString(EDataType eDataType, Object instanceValue) {
@@ -852,8 +847,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -862,8 +857,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -872,4 +867,4 @@
 		return AcceleoPackage.eINSTANCE;
 	}
 
-} //AcceleoFactoryImpl
+} // AcceleoFactoryImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/AcceleoPackageImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/AcceleoPackageImpl.java
index c587146..536d744 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/AcceleoPackageImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/AcceleoPackageImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/BindingImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/BindingImpl.java
index 13b7d1d..996f192 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/BindingImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/BindingImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -36,6 +36,7 @@
 	/**
 	 * The cached value of the '{@link #getInitExpression() <em>Init Expression</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getInitExpression()
 	 * @generated
 	 * @ordered
@@ -44,6 +45,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BindingImpl() {
@@ -52,6 +54,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -61,6 +64,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -70,6 +74,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetInitExpression(Expression newInitExpression, NotificationChain msgs) {
@@ -88,6 +93,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -110,6 +116,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,6 +130,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -136,6 +144,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -150,6 +159,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -164,6 +174,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/BlockCommentImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/BlockCommentImpl.java
index 65c91e5..60d5b5f 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/BlockCommentImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/BlockCommentImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -13,20 +13,18 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.BlockComment;
-
 import org.eclipse.emf.ecore.EClass;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Block Comment</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Block Comment</b></em>'. <!--
+ * end-user-doc -->
  *
  * @generated
  */
 public class BlockCommentImpl extends CommentImpl implements BlockComment {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BlockCommentImpl() {
@@ -34,8 +32,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -43,4 +41,4 @@
 		return AcceleoPackage.Literals.BLOCK_COMMENT;
 	}
 
-} //BlockCommentImpl
+} // BlockCommentImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/BlockImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/BlockImpl.java
index 7e5935b..1b99ae6 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/BlockImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/BlockImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -18,36 +18,32 @@
 import org.eclipse.acceleo.Statement;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Block</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Block</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.BlockImpl#getStatements <em>Statements</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.BlockImpl#isInlined <em>Inlined</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.BlockImpl#getStatements <em>Statements</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.BlockImpl#isInlined <em>Inlined</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class BlockImpl extends MinimalEObjectImpl.Container implements Block {
 	/**
-	 * The cached value of the '{@link #getStatements() <em>Statements</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getStatements() <em>Statements</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStatements()
 	 * @generated
 	 * @ordered
@@ -55,9 +51,9 @@
 	protected EList<Statement> statements;
 
 	/**
-	 * The default value of the '{@link #isInlined() <em>Inlined</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #isInlined() <em>Inlined</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isInlined()
 	 * @generated
 	 * @ordered
@@ -65,9 +61,9 @@
 	protected static final boolean INLINED_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isInlined() <em>Inlined</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isInlined() <em>Inlined</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isInlined()
 	 * @generated
 	 * @ordered
@@ -75,8 +71,8 @@
 	protected boolean inlined = INLINED_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BlockImpl() {
@@ -84,8 +80,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -94,8 +90,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -108,8 +104,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -118,8 +114,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -132,8 +128,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -146,8 +142,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,8 +158,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -182,8 +178,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -200,8 +196,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -216,8 +212,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -232,4 +228,4 @@
 		return result.toString();
 	}
 
-} //BlockImpl
+} // BlockImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/CommentBodyImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/CommentBodyImpl.java
index 6123eba..acd01f2 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/CommentBodyImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/CommentBodyImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -13,32 +13,28 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.CommentBody;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Comment Body</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Comment Body</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.CommentBodyImpl#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.CommentBodyImpl#getValue <em>Value</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class CommentBodyImpl extends MinimalEObjectImpl.Container implements CommentBody {
 	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -46,9 +42,9 @@
 	protected static final String VALUE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -56,8 +52,8 @@
 	protected String value = VALUE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CommentBodyImpl() {
@@ -65,8 +61,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -75,8 +71,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -85,8 +81,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,8 +95,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,8 +124,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -143,8 +139,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -157,8 +153,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -173,4 +169,4 @@
 		return result.toString();
 	}
 
-} //CommentBodyImpl
+} // CommentBodyImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/CommentImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/CommentImpl.java
index c404c4b..6529e49 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/CommentImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/CommentImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,33 +14,29 @@
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.Comment;
 import org.eclipse.acceleo.CommentBody;
-
 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;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Comment</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Comment</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.CommentImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.CommentImpl#getBody <em>Body</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class CommentImpl extends ModuleElementImpl implements Comment {
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -48,8 +44,8 @@
 	protected CommentBody body;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CommentImpl() {
@@ -57,8 +53,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,8 +63,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -77,8 +73,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(CommentBody newBody, NotificationChain msgs) {
@@ -96,8 +92,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -119,8 +115,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -133,8 +129,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -147,8 +143,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,8 +158,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -177,8 +173,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -190,4 +186,4 @@
 		return super.eIsSet(featureID);
 	}
 
-} //CommentImpl
+} // CommentImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorBindingImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorBindingImpl.java
index ce128f0..b1badb7 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorBindingImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorBindingImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -33,24 +33,26 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getTypeAql <em>Type Aql</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getInitExpression <em>Init Expression</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getMissingName <em>Missing Name</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getMissingColon <em>Missing Colon</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getMissingType <em>Missing Type</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getMissingAffectationSymbole <em>Missing Affectation Symbole</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getMissingAffectationSymbolePosition <em>Missing Affectation Symbole Position</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getTypeAql <em>Type Aql</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getInitExpression <em>Init Expression</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getMissingName <em>Missing Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getMissingColon <em>Missing Colon</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getMissingType <em>Missing Type</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getMissingAffectationSymbole <em>Missing Affectation
+ * Symbole</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorBindingImpl#getMissingAffectationSymbolePosition <em>Missing
+ * Affectation Symbole Position</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorBindingImpl extends MinimalEObjectImpl.Container implements ErrorBinding {
 	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -58,9 +60,9 @@
 	protected static final AstResult TYPE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -78,9 +80,9 @@
 	protected org.eclipse.acceleo.query.ast.Expression typeAql;
 
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -88,9 +90,9 @@
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -100,6 +102,7 @@
 	/**
 	 * The cached value of the '{@link #getInitExpression() <em>Init Expression</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getInitExpression()
 	 * @generated
 	 * @ordered
@@ -167,8 +170,9 @@
 	protected int missingType = MISSING_TYPE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingAffectationSymbole() <em>Missing Affectation Symbole</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingAffectationSymbole() <em>Missing Affectation Symbole</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingAffectationSymbole()
 	 * @generated
 	 * @ordered
@@ -176,8 +180,9 @@
 	protected static final String MISSING_AFFECTATION_SYMBOLE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getMissingAffectationSymbole() <em>Missing Affectation Symbole</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingAffectationSymbole() <em>Missing Affectation Symbole</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingAffectationSymbole()
 	 * @generated
 	 * @ordered
@@ -185,8 +190,9 @@
 	protected String missingAffectationSymbole = MISSING_AFFECTATION_SYMBOLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingAffectationSymbolePosition() <em>Missing Affectation Symbole Position</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingAffectationSymbolePosition() <em>Missing Affectation
+	 * Symbole Position</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingAffectationSymbolePosition()
 	 * @generated
 	 * @ordered
@@ -194,8 +200,9 @@
 	protected static final int MISSING_AFFECTATION_SYMBOLE_POSITION_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingAffectationSymbolePosition() <em>Missing Affectation Symbole Position</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingAffectationSymbolePosition() <em>Missing Affectation Symbole
+	 * Position</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingAffectationSymbolePosition()
 	 * @generated
 	 * @ordered
@@ -204,6 +211,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorBindingImpl() {
@@ -212,6 +220,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -221,6 +230,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -230,6 +240,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -243,6 +254,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -252,6 +264,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTypeAql(org.eclipse.acceleo.query.ast.Expression newTypeAql,
@@ -271,6 +284,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -293,6 +307,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -302,6 +317,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -315,6 +331,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -324,6 +341,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetInitExpression(Expression newInitExpression, NotificationChain msgs) {
@@ -342,6 +360,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -364,6 +383,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -373,6 +393,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -386,6 +407,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -395,6 +417,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -408,6 +431,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -417,6 +441,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -430,6 +455,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -439,6 +465,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -453,6 +480,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -462,6 +490,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -476,6 +505,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -491,6 +521,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -520,6 +551,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -558,6 +590,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -596,6 +629,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -626,6 +660,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -667,6 +702,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -708,6 +744,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorBlockCommentImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorBlockCommentImpl.java
index 5fc1092..8f6127e 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorBlockCommentImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorBlockCommentImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -13,20 +13,18 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorBlockComment;
-
 import org.eclipse.emf.ecore.EClass;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error Block Comment</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Block Comment</b></em>'. <!--
+ * end-user-doc -->
  *
  * @generated
  */
 public class ErrorBlockCommentImpl extends ErrorCommentImpl implements ErrorBlockComment {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorBlockCommentImpl() {
@@ -34,8 +32,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -43,4 +41,4 @@
 		return AcceleoPackage.Literals.ERROR_BLOCK_COMMENT;
 	}
 
-} //ErrorBlockCommentImpl
+} // ErrorBlockCommentImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorCommentImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorCommentImpl.java
index 37d416c..211f961 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorCommentImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorCommentImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,35 +17,31 @@
 import org.eclipse.acceleo.ErrorComment;
 import org.eclipse.acceleo.ModuleElement;
 import org.eclipse.acceleo.Statement;
-
 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.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error Comment</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Comment</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorCommentImpl#getBody <em>Body</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorCommentImpl#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorCommentImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorCommentImpl#getMissingEndHeader <em>Missing End Header</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorCommentImpl extends MinimalEObjectImpl.Container implements ErrorComment {
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -53,9 +49,9 @@
 	protected CommentBody body;
 
 	/**
-	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -63,9 +59,9 @@
 	protected static final int MISSING_END_HEADER_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -73,8 +69,8 @@
 	protected int missingEndHeader = MISSING_END_HEADER_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorCommentImpl() {
@@ -82,8 +78,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -92,8 +88,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -102,8 +98,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(CommentBody newBody, NotificationChain msgs) {
@@ -121,8 +117,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -144,8 +140,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -154,8 +150,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -168,8 +164,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -182,8 +178,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -198,8 +194,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -216,8 +212,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -234,8 +230,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -250,8 +246,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -280,8 +276,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -310,8 +306,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -326,4 +322,4 @@
 		return result.toString();
 	}
 
-} //ErrorCommentImpl
+} // ErrorCommentImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorExpressionImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorExpressionImpl.java
index 1c8b716..6f2cba0 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorExpressionImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorExpressionImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,33 +16,30 @@
 import org.eclipse.acceleo.Expression;
 import org.eclipse.acceleo.query.parser.AstResult;
 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.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error Expression</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Expression</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorExpressionImpl#getAst <em>Ast</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorExpressionImpl#getAql <em>Aql</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorExpressionImpl#getAst <em>Ast</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorExpressionImpl#getAql <em>Aql</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorExpressionImpl extends MinimalEObjectImpl.Container implements ErrorExpression {
 	/**
-	 * The default value of the '{@link #getAst() <em>Ast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAst() <em>Ast</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAst()
 	 * @generated
 	 * @ordered
@@ -50,9 +47,9 @@
 	protected static final AstResult AST_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getAst() <em>Ast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAst() <em>Ast</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAst()
 	 * @generated
 	 * @ordered
@@ -60,9 +57,9 @@
 	protected AstResult ast = AST_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getAql() <em>Aql</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getAql() <em>Aql</em>}' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAql()
 	 * @generated
 	 * @ordered
@@ -70,8 +67,8 @@
 	protected org.eclipse.acceleo.query.ast.Expression aql;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorExpressionImpl() {
@@ -79,8 +76,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,8 +86,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,8 +96,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +110,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,8 +120,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetAql(org.eclipse.acceleo.query.ast.Expression newAql,
@@ -143,8 +140,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -166,8 +163,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -180,8 +177,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -196,8 +193,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -214,8 +211,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -232,8 +229,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -248,8 +245,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -268,8 +265,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -288,8 +285,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -304,4 +301,4 @@
 		return result.toString();
 	}
 
-} //ErrorExpressionImpl
+} // ErrorExpressionImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorExpressionStatementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorExpressionStatementImpl.java
index 393d036..31b2286 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorExpressionStatementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorExpressionStatementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,36 +17,34 @@
 import org.eclipse.acceleo.ExpressionStatement;
 import org.eclipse.acceleo.LeafStatement;
 import org.eclipse.acceleo.Statement;
-
 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.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error Expression Statement</b></em>'.
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Expression Statement</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorExpressionStatementImpl#isNewLineNeeded <em>New Line Needed</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorExpressionStatementImpl#getExpression <em>Expression</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorExpressionStatementImpl#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorExpressionStatementImpl#isNewLineNeeded <em>New Line
+ * Needed</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorExpressionStatementImpl#getExpression <em>Expression</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorExpressionStatementImpl#getMissingEndHeader <em>Missing End
+ * Header</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorExpressionStatementImpl extends MinimalEObjectImpl.Container implements ErrorExpressionStatement {
 	/**
-	 * The default value of the '{@link #isNewLineNeeded() <em>New Line Needed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isNewLineNeeded() <em>New Line Needed</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isNewLineNeeded()
 	 * @generated
 	 * @ordered
@@ -54,9 +52,9 @@
 	protected static final boolean NEW_LINE_NEEDED_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isNewLineNeeded() <em>New Line Needed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isNewLineNeeded() <em>New Line Needed</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isNewLineNeeded()
 	 * @generated
 	 * @ordered
@@ -64,9 +62,9 @@
 	protected boolean newLineNeeded = NEW_LINE_NEEDED_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getExpression()
 	 * @generated
 	 * @ordered
@@ -74,9 +72,9 @@
 	protected Expression expression;
 
 	/**
-	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -84,9 +82,9 @@
 	protected static final int MISSING_END_HEADER_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -94,8 +92,8 @@
 	protected int missingEndHeader = MISSING_END_HEADER_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorExpressionStatementImpl() {
@@ -103,8 +101,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +111,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,8 +121,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -138,8 +136,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -148,8 +146,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetExpression(Expression newExpression, NotificationChain msgs) {
@@ -167,8 +165,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -190,8 +188,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -200,8 +198,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -215,8 +213,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -229,8 +227,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -247,8 +245,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -268,8 +266,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -289,8 +287,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -307,8 +305,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -339,8 +337,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -371,8 +369,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -389,4 +387,4 @@
 		return result.toString();
 	}
 
-} //ErrorExpressionStatementImpl
+} // ErrorExpressionStatementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorFileStatementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorFileStatementImpl.java
index d9a20c5..216bddf 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorFileStatementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorFileStatementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -18,43 +18,43 @@
 import org.eclipse.acceleo.FileStatement;
 import org.eclipse.acceleo.OpenModeKind;
 import org.eclipse.acceleo.Statement;
-
 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.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error File Statement</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error File Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getMode <em>Mode</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getUrl <em>Url</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getCharset <em>Charset</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getBody <em>Body</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getMissingComma <em>Missing Comma</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getMissingOpenMode <em>Missing Open Mode</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getMissingEndHeader <em>Missing End Header</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getUrl <em>Url</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getCharset <em>Charset</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getMissingOpenParenthesis <em>Missing Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getMissingComma <em>Missing Comma</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getMissingOpenMode <em>Missing Open
+ * Mode</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getMissingCloseParenthesis <em>Missing Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getMissingEndHeader <em>Missing End
+ * Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorFileStatementImpl#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorFileStatementImpl extends MinimalEObjectImpl.Container implements ErrorFileStatement {
 	/**
-	 * The default value of the '{@link #getMode() <em>Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMode() <em>Mode</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMode()
 	 * @generated
 	 * @ordered
@@ -62,9 +62,9 @@
 	protected static final OpenModeKind MODE_EDEFAULT = OpenModeKind.OVERWRITE;
 
 	/**
-	 * The cached value of the '{@link #getMode() <em>Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMode() <em>Mode</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMode()
 	 * @generated
 	 * @ordered
@@ -72,9 +72,9 @@
 	protected OpenModeKind mode = MODE_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getUrl() <em>Url</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getUrl() <em>Url</em>}' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getUrl()
 	 * @generated
 	 * @ordered
@@ -82,9 +82,9 @@
 	protected Expression url;
 
 	/**
-	 * The cached value of the '{@link #getCharset() <em>Charset</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCharset() <em>Charset</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getCharset()
 	 * @generated
 	 * @ordered
@@ -92,9 +92,9 @@
 	protected Expression charset;
 
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -102,9 +102,9 @@
 	protected Block body;
 
 	/**
-	 * The default value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -112,9 +112,9 @@
 	protected static final int MISSING_OPEN_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -122,9 +122,9 @@
 	protected int missingOpenParenthesis = MISSING_OPEN_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingComma() <em>Missing Comma</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingComma() <em>Missing Comma</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingComma()
 	 * @generated
 	 * @ordered
@@ -132,9 +132,9 @@
 	protected static final int MISSING_COMMA_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingComma() <em>Missing Comma</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingComma() <em>Missing Comma</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingComma()
 	 * @generated
 	 * @ordered
@@ -142,9 +142,9 @@
 	protected int missingComma = MISSING_COMMA_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingOpenMode() <em>Missing Open Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingOpenMode() <em>Missing Open Mode</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenMode()
 	 * @generated
 	 * @ordered
@@ -152,9 +152,9 @@
 	protected static final int MISSING_OPEN_MODE_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingOpenMode() <em>Missing Open Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingOpenMode() <em>Missing Open Mode</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenMode()
 	 * @generated
 	 * @ordered
@@ -162,9 +162,9 @@
 	protected int missingOpenMode = MISSING_OPEN_MODE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -172,9 +172,9 @@
 	protected static final int MISSING_CLOSE_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -182,9 +182,9 @@
 	protected int missingCloseParenthesis = MISSING_CLOSE_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -192,9 +192,9 @@
 	protected static final int MISSING_END_HEADER_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -202,9 +202,9 @@
 	protected int missingEndHeader = MISSING_END_HEADER_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -212,9 +212,9 @@
 	protected static final int MISSING_END_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -222,8 +222,8 @@
 	protected int missingEnd = MISSING_END_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorFileStatementImpl() {
@@ -231,8 +231,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -241,8 +241,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,8 +251,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -265,8 +265,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -275,8 +275,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetUrl(Expression newUrl, NotificationChain msgs) {
@@ -294,8 +294,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -317,8 +317,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -327,8 +327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetCharset(Expression newCharset, NotificationChain msgs) {
@@ -346,8 +346,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -369,8 +369,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -379,8 +379,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(Block newBody, NotificationChain msgs) {
@@ -398,8 +398,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -421,8 +421,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -431,8 +431,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -446,8 +446,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -456,8 +456,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -470,8 +470,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -480,8 +480,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -495,8 +495,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -505,8 +505,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -520,8 +520,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -530,8 +530,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -545,8 +545,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -555,8 +555,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -569,8 +569,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -587,8 +587,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -619,8 +619,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -661,8 +661,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -703,8 +703,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -735,8 +735,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -765,8 +765,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -795,8 +795,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -823,4 +823,4 @@
 		return result.toString();
 	}
 
-} //ErrorFileStatementImpl
+} // ErrorFileStatementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorForStatementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorForStatementImpl.java
index 6269f6f..a635582 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorForStatementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorForStatementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -18,42 +18,42 @@
 import org.eclipse.acceleo.Expression;
 import org.eclipse.acceleo.ForStatement;
 import org.eclipse.acceleo.Statement;
-
 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.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error For Statement</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error For Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getBinding <em>Binding</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getSeparator <em>Separator</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getBody <em>Body</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getMissingBinding <em>Missing Binding</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getMissingSeparatorCloseParenthesis <em>Missing Separator Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getMissingEndHeader <em>Missing End Header</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getBinding <em>Binding</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getSeparator <em>Separator</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getMissingOpenParenthesis <em>Missing Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getMissingBinding <em>Missing Binding</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getMissingCloseParenthesis <em>Missing Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getMissingSeparatorCloseParenthesis <em>Missing
+ * Separator Close Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getMissingEndHeader <em>Missing End
+ * Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorForStatementImpl#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorForStatementImpl extends MinimalEObjectImpl.Container implements ErrorForStatement {
 	/**
-	 * The cached value of the '{@link #getBinding() <em>Binding</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBinding() <em>Binding</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBinding()
 	 * @generated
 	 * @ordered
@@ -61,9 +61,9 @@
 	protected Binding binding;
 
 	/**
-	 * The cached value of the '{@link #getSeparator() <em>Separator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSeparator() <em>Separator</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSeparator()
 	 * @generated
 	 * @ordered
@@ -71,9 +71,9 @@
 	protected Expression separator;
 
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -81,9 +81,9 @@
 	protected Block body;
 
 	/**
-	 * The default value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -91,9 +91,9 @@
 	protected static final int MISSING_OPEN_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -101,9 +101,9 @@
 	protected int missingOpenParenthesis = MISSING_OPEN_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingBinding() <em>Missing Binding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingBinding() <em>Missing Binding</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingBinding()
 	 * @generated
 	 * @ordered
@@ -111,9 +111,9 @@
 	protected static final int MISSING_BINDING_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingBinding() <em>Missing Binding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingBinding() <em>Missing Binding</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingBinding()
 	 * @generated
 	 * @ordered
@@ -121,9 +121,9 @@
 	protected int missingBinding = MISSING_BINDING_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -131,9 +131,9 @@
 	protected static final int MISSING_CLOSE_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -141,9 +141,9 @@
 	protected int missingCloseParenthesis = MISSING_CLOSE_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingSeparatorCloseParenthesis() <em>Missing Separator Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingSeparatorCloseParenthesis() <em>Missing Separator Close
+	 * Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingSeparatorCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -151,9 +151,9 @@
 	protected static final int MISSING_SEPARATOR_CLOSE_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingSeparatorCloseParenthesis() <em>Missing Separator Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingSeparatorCloseParenthesis() <em>Missing Separator Close
+	 * Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingSeparatorCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -161,9 +161,9 @@
 	protected int missingSeparatorCloseParenthesis = MISSING_SEPARATOR_CLOSE_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -171,9 +171,9 @@
 	protected static final int MISSING_END_HEADER_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -181,9 +181,9 @@
 	protected int missingEndHeader = MISSING_END_HEADER_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -191,9 +191,9 @@
 	protected static final int MISSING_END_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -201,8 +201,8 @@
 	protected int missingEnd = MISSING_END_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorForStatementImpl() {
@@ -210,8 +210,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -220,8 +220,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -230,8 +230,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBinding(Binding newBinding, NotificationChain msgs) {
@@ -249,8 +249,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -272,8 +272,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -282,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetSeparator(Expression newSeparator, NotificationChain msgs) {
@@ -301,8 +301,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -324,8 +324,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -334,8 +334,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(Block newBody, NotificationChain msgs) {
@@ -353,8 +353,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -376,8 +376,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -386,8 +386,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -401,8 +401,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -411,8 +411,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -425,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -435,8 +435,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -450,8 +450,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -460,8 +460,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -475,8 +475,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -485,8 +485,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -500,8 +500,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -510,8 +510,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -524,8 +524,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -542,8 +542,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -572,8 +572,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -611,8 +611,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -650,8 +650,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -680,8 +680,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -708,8 +708,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -736,8 +736,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -762,4 +762,4 @@
 		return result.toString();
 	}
 
-} //ErrorForStatementImpl
+} // ErrorForStatementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorIfStatementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorIfStatementImpl.java
index 9b8553d..e3220f7 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorIfStatementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorIfStatementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,40 +17,39 @@
 import org.eclipse.acceleo.Expression;
 import org.eclipse.acceleo.IfStatement;
 import org.eclipse.acceleo.Statement;
-
 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.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error If Statement</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error If Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl#getCondition <em>Condition</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl#getThen <em>Then</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl#getElse <em>Else</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl#getMissingEndHeader <em>Missing End Header</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl#getCondition <em>Condition</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl#getThen <em>Then</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl#getElse <em>Else</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl#getMissingOpenParenthesis <em>Missing Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl#getMissingCloseParenthesis <em>Missing Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl#getMissingEndHeader <em>Missing End
+ * Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorIfStatementImpl#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorIfStatementImpl extends MinimalEObjectImpl.Container implements ErrorIfStatement {
 	/**
-	 * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getCondition()
 	 * @generated
 	 * @ordered
@@ -58,9 +57,9 @@
 	protected Expression condition;
 
 	/**
-	 * The cached value of the '{@link #getThen() <em>Then</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getThen() <em>Then</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getThen()
 	 * @generated
 	 * @ordered
@@ -68,9 +67,9 @@
 	protected Block then;
 
 	/**
-	 * The cached value of the '{@link #getElse() <em>Else</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getElse() <em>Else</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getElse()
 	 * @generated
 	 * @ordered
@@ -78,9 +77,9 @@
 	protected Block else_;
 
 	/**
-	 * The default value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -88,9 +87,9 @@
 	protected static final int MISSING_OPEN_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -98,9 +97,9 @@
 	protected int missingOpenParenthesis = MISSING_OPEN_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -108,9 +107,9 @@
 	protected static final int MISSING_CLOSE_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -118,9 +117,9 @@
 	protected int missingCloseParenthesis = MISSING_CLOSE_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -128,9 +127,9 @@
 	protected static final int MISSING_END_HEADER_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -138,9 +137,9 @@
 	protected int missingEndHeader = MISSING_END_HEADER_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -148,9 +147,9 @@
 	protected static final int MISSING_END_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -158,8 +157,8 @@
 	protected int missingEnd = MISSING_END_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorIfStatementImpl() {
@@ -167,8 +166,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -177,8 +176,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -187,8 +186,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetCondition(Expression newCondition, NotificationChain msgs) {
@@ -206,8 +205,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -229,8 +228,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -239,8 +238,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetThen(Block newThen, NotificationChain msgs) {
@@ -258,8 +257,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -281,8 +280,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -291,8 +290,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetElse(Block newElse, NotificationChain msgs) {
@@ -310,8 +309,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -333,8 +332,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -343,8 +342,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -358,8 +357,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -368,8 +367,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -383,8 +382,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -393,8 +392,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -408,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -418,8 +417,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -432,8 +431,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -450,8 +449,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -476,8 +475,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -509,8 +508,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -542,8 +541,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -568,8 +567,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -596,8 +595,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -624,8 +623,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -646,4 +645,4 @@
 		return result.toString();
 	}
 
-} //ErrorIfStatementImpl
+} // ErrorIfStatementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorImportImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorImportImpl.java
index 4e30037..df92ba7 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorImportImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorImportImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -15,35 +15,31 @@
 import org.eclipse.acceleo.ErrorImport;
 import org.eclipse.acceleo.Import;
 import org.eclipse.acceleo.ModuleReference;
-
 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.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error Import</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Import</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorImportImpl#getModule <em>Module</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorImportImpl#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorImportImpl#getModule <em>Module</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorImportImpl#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorImportImpl extends MinimalEObjectImpl.Container implements ErrorImport {
 	/**
-	 * The cached value of the '{@link #getModule() <em>Module</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getModule() <em>Module</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getModule()
 	 * @generated
 	 * @ordered
@@ -51,9 +47,9 @@
 	protected ModuleReference module;
 
 	/**
-	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -61,9 +57,9 @@
 	protected static final int MISSING_END_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -71,8 +67,8 @@
 	protected int missingEnd = MISSING_END_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorImportImpl() {
@@ -80,8 +76,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -90,8 +86,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -100,8 +96,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetModule(ModuleReference newModule, NotificationChain msgs) {
@@ -119,8 +115,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -142,8 +138,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -152,8 +148,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -166,8 +162,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -180,8 +176,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -196,8 +192,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -214,8 +210,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -232,8 +228,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -248,8 +244,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,8 +262,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -284,8 +280,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -300,4 +296,4 @@
 		return result.toString();
 	}
 
-} //ErrorImportImpl
+} // ErrorImportImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorLetStatementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorLetStatementImpl.java
index 2e5a126..4cf2232 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorLetStatementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorLetStatementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,49 +12,46 @@
 package org.eclipse.acceleo.impl;
 
 import java.util.Collection;
+
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.Binding;
 import org.eclipse.acceleo.Block;
 import org.eclipse.acceleo.ErrorLetStatement;
 import org.eclipse.acceleo.LetStatement;
 import org.eclipse.acceleo.Statement;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error Let Statement</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Let Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorLetStatementImpl#getVariables <em>Variables</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorLetStatementImpl#getBody <em>Body</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorLetStatementImpl#getMissingBindings <em>Missing Bindings</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorLetStatementImpl#getMissingEndHeader <em>Missing End Header</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorLetStatementImpl#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorLetStatementImpl#getVariables <em>Variables</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorLetStatementImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorLetStatementImpl#getMissingBindings <em>Missing
+ * Bindings</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorLetStatementImpl#getMissingEndHeader <em>Missing End
+ * Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorLetStatementImpl#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorLetStatementImpl extends MinimalEObjectImpl.Container implements ErrorLetStatement {
 	/**
-	 * The cached value of the '{@link #getVariables() <em>Variables</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getVariables() <em>Variables</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getVariables()
 	 * @generated
 	 * @ordered
@@ -62,9 +59,9 @@
 	protected EList<Binding> variables;
 
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -72,9 +69,9 @@
 	protected Block body;
 
 	/**
-	 * The default value of the '{@link #getMissingBindings() <em>Missing Bindings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingBindings() <em>Missing Bindings</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingBindings()
 	 * @generated
 	 * @ordered
@@ -82,9 +79,9 @@
 	protected static final int MISSING_BINDINGS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingBindings() <em>Missing Bindings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingBindings() <em>Missing Bindings</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingBindings()
 	 * @generated
 	 * @ordered
@@ -92,9 +89,9 @@
 	protected int missingBindings = MISSING_BINDINGS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -102,9 +99,9 @@
 	protected static final int MISSING_END_HEADER_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -112,9 +109,9 @@
 	protected int missingEndHeader = MISSING_END_HEADER_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -122,9 +119,9 @@
 	protected static final int MISSING_END_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -132,8 +129,8 @@
 	protected int missingEnd = MISSING_END_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorLetStatementImpl() {
@@ -141,8 +138,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -151,8 +148,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -165,8 +162,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -175,8 +172,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(Block newBody, NotificationChain msgs) {
@@ -194,8 +191,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -217,8 +214,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -227,8 +224,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -242,8 +239,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -252,8 +249,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -267,8 +264,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -277,8 +274,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -291,8 +288,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -307,8 +304,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -329,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -358,8 +355,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -385,8 +382,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -407,8 +404,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -433,8 +430,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -459,8 +456,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -479,4 +476,4 @@
 		return result.toString();
 	}
 
-} //ErrorLetStatementImpl
+} // ErrorLetStatementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorMetamodelImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorMetamodelImpl.java
index e057a63..e5bfbd8 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorMetamodelImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorMetamodelImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,36 +14,33 @@
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorMetamodel;
 import org.eclipse.acceleo.Metamodel;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error Metamodel</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Metamodel</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorMetamodelImpl#getReferencedPackage <em>Referenced Package</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorMetamodelImpl#getFragment <em>Fragment</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorMetamodelImpl#getMissingEndQuote <em>Missing End Quote</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorMetamodelImpl#getReferencedPackage <em>Referenced
+ * Package</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorMetamodelImpl#getFragment <em>Fragment</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorMetamodelImpl#getMissingEndQuote <em>Missing End Quote</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorMetamodelImpl extends MinimalEObjectImpl.Container implements ErrorMetamodel {
 	/**
-	 * The cached value of the '{@link #getReferencedPackage() <em>Referenced Package</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getReferencedPackage() <em>Referenced Package</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getReferencedPackage()
 	 * @generated
 	 * @ordered
@@ -51,9 +48,9 @@
 	protected EPackage referencedPackage;
 
 	/**
-	 * The default value of the '{@link #getFragment() <em>Fragment</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getFragment() <em>Fragment</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFragment()
 	 * @generated
 	 * @ordered
@@ -61,9 +58,9 @@
 	protected static final String FRAGMENT_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getFragment() <em>Fragment</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getFragment() <em>Fragment</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFragment()
 	 * @generated
 	 * @ordered
@@ -71,9 +68,9 @@
 	protected String fragment = FRAGMENT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEndQuote() <em>Missing End Quote</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEndQuote() <em>Missing End Quote</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndQuote()
 	 * @generated
 	 * @ordered
@@ -81,9 +78,9 @@
 	protected static final int MISSING_END_QUOTE_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEndQuote() <em>Missing End Quote</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEndQuote() <em>Missing End Quote</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndQuote()
 	 * @generated
 	 * @ordered
@@ -91,8 +88,8 @@
 	protected int missingEndQuote = MISSING_END_QUOTE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorMetamodelImpl() {
@@ -100,8 +97,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -110,8 +107,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -130,8 +127,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EPackage basicGetReferencedPackage() {
@@ -139,8 +136,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -154,8 +151,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -164,8 +161,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -178,8 +175,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -188,8 +185,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -202,8 +199,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -222,8 +219,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -243,8 +240,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -264,8 +261,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -282,8 +279,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -300,8 +297,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -318,8 +315,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -336,4 +333,4 @@
 		return result.toString();
 	}
 
-} //ErrorMetamodelImpl
+} // ErrorMetamodelImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleDocumentationImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleDocumentationImpl.java
index 9350408..881e65a 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleDocumentationImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleDocumentationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -20,39 +20,37 @@
 import org.eclipse.acceleo.ModuleDocumentation;
 import org.eclipse.acceleo.ModuleElement;
 import org.eclipse.acceleo.Statement;
-
 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.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error Module Documentation</b></em>'.
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Module Documentation</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl#getBody <em>Body</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl#getDocumentedElement <em>Documented Element</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl#getAuthor <em>Author</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl#getVersion <em>Version</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl#getSince <em>Since</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl#getDocumentedElement <em>Documented
+ * Element</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl#getAuthor <em>Author</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl#getVersion <em>Version</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl#getSince <em>Since</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleDocumentationImpl#getMissingEndHeader <em>Missing End
+ * Header</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorModuleDocumentationImpl extends MinimalEObjectImpl.Container implements ErrorModuleDocumentation {
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -60,9 +58,9 @@
 	protected CommentBody body;
 
 	/**
-	 * The cached value of the '{@link #getDocumentedElement() <em>Documented Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDocumentedElement() <em>Documented Element</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDocumentedElement()
 	 * @generated
 	 * @ordered
@@ -70,9 +68,9 @@
 	protected DocumentedElement documentedElement;
 
 	/**
-	 * The default value of the '{@link #getAuthor() <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAuthor() <em>Author</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAuthor()
 	 * @generated
 	 * @ordered
@@ -80,9 +78,9 @@
 	protected static final String AUTHOR_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getAuthor() <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAuthor() <em>Author</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAuthor()
 	 * @generated
 	 * @ordered
@@ -90,9 +88,9 @@
 	protected String author = AUTHOR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVersion()
 	 * @generated
 	 * @ordered
@@ -100,9 +98,9 @@
 	protected static final String VERSION_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVersion()
 	 * @generated
 	 * @ordered
@@ -110,9 +108,9 @@
 	protected String version = VERSION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSince() <em>Since</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSince() <em>Since</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSince()
 	 * @generated
 	 * @ordered
@@ -120,9 +118,9 @@
 	protected static final String SINCE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getSince() <em>Since</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSince() <em>Since</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSince()
 	 * @generated
 	 * @ordered
@@ -130,9 +128,9 @@
 	protected String since = SINCE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -140,9 +138,9 @@
 	protected static final int MISSING_END_HEADER_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -150,8 +148,8 @@
 	protected int missingEndHeader = MISSING_END_HEADER_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorModuleDocumentationImpl() {
@@ -159,8 +157,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -169,8 +167,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -179,8 +177,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(CommentBody newBody, NotificationChain msgs) {
@@ -198,8 +196,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -221,8 +219,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -241,8 +239,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DocumentedElement basicGetDocumentedElement() {
@@ -250,8 +248,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDocumentedElement(DocumentedElement newDocumentedElement,
@@ -271,8 +269,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -295,8 +293,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -305,8 +303,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -319,8 +317,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -329,8 +327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -343,8 +341,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -353,8 +351,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -367,8 +365,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -377,8 +375,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -392,8 +390,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -409,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -425,8 +423,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -451,8 +449,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -481,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -511,8 +509,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -535,8 +533,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -585,8 +583,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -635,8 +633,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -657,4 +655,4 @@
 		return result.toString();
 	}
 
-} //ErrorModuleDocumentationImpl
+} // ErrorModuleDocumentationImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleElementDocumentationImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleElementDocumentationImpl.java
index e868f26..9faebe5 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleElementDocumentationImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleElementDocumentationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,6 +12,7 @@
 package org.eclipse.acceleo.impl;
 
 import java.util.Collection;
+
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.Comment;
 import org.eclipse.acceleo.CommentBody;
@@ -22,42 +23,39 @@
 import org.eclipse.acceleo.ModuleElementDocumentation;
 import org.eclipse.acceleo.ParameterDocumentation;
 import org.eclipse.acceleo.Statement;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error Module Element Documentation</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Module Element
+ * Documentation</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleElementDocumentationImpl#getBody <em>Body</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleElementDocumentationImpl#getDocumentedElement <em>Documented Element</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleElementDocumentationImpl#getParameterDocumentation <em>Parameter Documentation</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleElementDocumentationImpl#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleElementDocumentationImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleElementDocumentationImpl#getDocumentedElement <em>Documented
+ * Element</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleElementDocumentationImpl#getParameterDocumentation
+ * <em>Parameter Documentation</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleElementDocumentationImpl#getMissingEndHeader <em>Missing End
+ * Header</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorModuleElementDocumentationImpl extends MinimalEObjectImpl.Container implements ErrorModuleElementDocumentation {
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -65,9 +63,9 @@
 	protected CommentBody body;
 
 	/**
-	 * The cached value of the '{@link #getDocumentedElement() <em>Documented Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDocumentedElement() <em>Documented Element</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDocumentedElement()
 	 * @generated
 	 * @ordered
@@ -75,9 +73,9 @@
 	protected DocumentedElement documentedElement;
 
 	/**
-	 * The cached value of the '{@link #getParameterDocumentation() <em>Parameter Documentation</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getParameterDocumentation() <em>Parameter Documentation</em>}'
+	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getParameterDocumentation()
 	 * @generated
 	 * @ordered
@@ -85,9 +83,9 @@
 	protected EList<ParameterDocumentation> parameterDocumentation;
 
 	/**
-	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -95,9 +93,9 @@
 	protected static final int MISSING_END_HEADER_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -105,8 +103,8 @@
 	protected int missingEndHeader = MISSING_END_HEADER_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorModuleElementDocumentationImpl() {
@@ -114,8 +112,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -124,8 +122,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -134,8 +132,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(CommentBody newBody, NotificationChain msgs) {
@@ -153,8 +151,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -176,8 +174,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -196,8 +194,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DocumentedElement basicGetDocumentedElement() {
@@ -205,8 +203,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDocumentedElement(DocumentedElement newDocumentedElement,
@@ -226,8 +224,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -250,8 +248,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -265,8 +263,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -275,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -290,8 +288,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -307,8 +305,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -325,8 +323,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -347,8 +345,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -373,8 +371,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -397,8 +395,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -417,8 +415,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -463,8 +461,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -509,8 +507,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -525,4 +523,4 @@
 		return result.toString();
 	}
 
-} //ErrorModuleElementDocumentationImpl
+} // ErrorModuleElementDocumentationImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleImpl.java
index 21741bd..a2717ad 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,6 +12,7 @@
 package org.eclipse.acceleo.impl;
 
 import java.util.Collection;
+
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.Documentation;
 import org.eclipse.acceleo.DocumentedElement;
@@ -21,54 +22,51 @@
 import org.eclipse.acceleo.ModuleElement;
 import org.eclipse.acceleo.ModuleReference;
 import org.eclipse.acceleo.NamedElement;
-
 import org.eclipse.acceleo.aql.parser.AcceleoAstResult;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error Module</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Module</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getDocumentation <em>Documentation</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#isDeprecated <em>Deprecated</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getMetamodels <em>Metamodels</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getExtends <em>Extends</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getImports <em>Imports</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getModuleElements <em>Module Elements</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getStartHeaderPosition <em>Start Header Position</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getEndHeaderPosition <em>End Header Position</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getAst <em>Ast</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getMissingEPackage <em>Missing EPackage</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getDocumentation <em>Documentation</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#isDeprecated <em>Deprecated</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getMetamodels <em>Metamodels</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getExtends <em>Extends</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getImports <em>Imports</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getModuleElements <em>Module Elements</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getStartHeaderPosition <em>Start Header
+ * Position</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getEndHeaderPosition <em>End Header Position</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getAst <em>Ast</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getMissingOpenParenthesis <em>Missing Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getMissingEPackage <em>Missing EPackage</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getMissingCloseParenthesis <em>Missing Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleImpl#getMissingEndHeader <em>Missing End Header</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorModuleImpl extends MinimalEObjectImpl.Container implements ErrorModule {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -76,9 +74,9 @@
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -86,9 +84,9 @@
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDocumentation()
 	 * @generated
 	 * @ordered
@@ -96,9 +94,9 @@
 	protected Documentation documentation;
 
 	/**
-	 * The default value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDeprecated()
 	 * @generated
 	 * @ordered
@@ -106,9 +104,9 @@
 	protected static final boolean DEPRECATED_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDeprecated()
 	 * @generated
 	 * @ordered
@@ -116,9 +114,9 @@
 	protected boolean deprecated = DEPRECATED_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getMetamodels() <em>Metamodels</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMetamodels() <em>Metamodels</em>}' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMetamodels()
 	 * @generated
 	 * @ordered
@@ -126,9 +124,9 @@
 	protected EList<Metamodel> metamodels;
 
 	/**
-	 * The cached value of the '{@link #getExtends() <em>Extends</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getExtends() <em>Extends</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getExtends()
 	 * @generated
 	 * @ordered
@@ -136,9 +134,9 @@
 	protected ModuleReference extends_;
 
 	/**
-	 * The cached value of the '{@link #getImports() <em>Imports</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getImports() <em>Imports</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getImports()
 	 * @generated
 	 * @ordered
@@ -146,9 +144,9 @@
 	protected EList<Import> imports;
 
 	/**
-	 * The cached value of the '{@link #getModuleElements() <em>Module Elements</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getModuleElements() <em>Module Elements</em>}' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getModuleElements()
 	 * @generated
 	 * @ordered
@@ -157,8 +155,8 @@
 
 	/**
 	 * The default value of the '{@link #getStartHeaderPosition() <em>Start Header Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStartHeaderPosition()
 	 * @generated
 	 * @ordered
@@ -167,8 +165,8 @@
 
 	/**
 	 * The cached value of the '{@link #getStartHeaderPosition() <em>Start Header Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStartHeaderPosition()
 	 * @generated
 	 * @ordered
@@ -176,9 +174,9 @@
 	protected int startHeaderPosition = START_HEADER_POSITION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getEndHeaderPosition() <em>End Header Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getEndHeaderPosition() <em>End Header Position</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getEndHeaderPosition()
 	 * @generated
 	 * @ordered
@@ -186,9 +184,9 @@
 	protected static final int END_HEADER_POSITION_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getEndHeaderPosition() <em>End Header Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getEndHeaderPosition() <em>End Header Position</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getEndHeaderPosition()
 	 * @generated
 	 * @ordered
@@ -196,9 +194,9 @@
 	protected int endHeaderPosition = END_HEADER_POSITION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getAst() <em>Ast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAst() <em>Ast</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAst()
 	 * @generated
 	 * @ordered
@@ -206,9 +204,9 @@
 	protected static final AcceleoAstResult AST_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getAst() <em>Ast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAst() <em>Ast</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAst()
 	 * @generated
 	 * @ordered
@@ -216,9 +214,9 @@
 	protected AcceleoAstResult ast = AST_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -226,9 +224,9 @@
 	protected static final int MISSING_OPEN_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -236,9 +234,9 @@
 	protected int missingOpenParenthesis = MISSING_OPEN_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEPackage() <em>Missing EPackage</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEPackage() <em>Missing EPackage</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEPackage()
 	 * @generated
 	 * @ordered
@@ -246,9 +244,9 @@
 	protected static final int MISSING_EPACKAGE_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEPackage() <em>Missing EPackage</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEPackage() <em>Missing EPackage</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEPackage()
 	 * @generated
 	 * @ordered
@@ -256,9 +254,9 @@
 	protected int missingEPackage = MISSING_EPACKAGE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -266,9 +264,9 @@
 	protected static final int MISSING_CLOSE_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -276,9 +274,9 @@
 	protected int missingCloseParenthesis = MISSING_CLOSE_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -286,9 +284,9 @@
 	protected static final int MISSING_END_HEADER_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -296,8 +294,8 @@
 	protected int missingEndHeader = MISSING_END_HEADER_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorModuleImpl() {
@@ -305,8 +303,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -315,8 +313,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -325,8 +323,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -339,8 +337,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -358,8 +356,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Documentation basicGetDocumentation() {
@@ -367,8 +365,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDocumentation(Documentation newDocumentation, NotificationChain msgs) {
@@ -386,8 +384,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -409,8 +407,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -419,8 +417,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -433,8 +431,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -447,8 +445,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -457,8 +455,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetExtends(ModuleReference newExtends, NotificationChain msgs) {
@@ -476,8 +474,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -499,8 +497,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -513,8 +511,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -527,8 +525,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -537,8 +535,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -552,8 +550,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -562,8 +560,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -577,8 +575,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -587,8 +585,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -601,8 +599,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -611,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -626,8 +624,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -636,8 +634,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -650,8 +648,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -660,8 +658,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -675,8 +673,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -685,8 +683,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -699,8 +697,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -716,8 +714,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -736,8 +734,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -778,8 +776,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -836,8 +834,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -890,8 +888,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -930,8 +928,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -978,8 +976,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1026,8 +1024,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1058,4 +1056,4 @@
 		return result.toString();
 	}
 
-} //ErrorModuleImpl
+} // ErrorModuleImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleReferenceImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleReferenceImpl.java
index 0e49329..6d3e4c37 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleReferenceImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorModuleReferenceImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,32 +14,28 @@
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ErrorModuleReference;
 import org.eclipse.acceleo.ModuleReference;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error Module Reference</b></em>'.
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Module Reference</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorModuleReferenceImpl#getQualifiedName <em>Qualified Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorModuleReferenceImpl#getQualifiedName <em>Qualified Name</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorModuleReferenceImpl extends MinimalEObjectImpl.Container implements ErrorModuleReference {
 	/**
-	 * The default value of the '{@link #getQualifiedName() <em>Qualified Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getQualifiedName() <em>Qualified Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getQualifiedName()
 	 * @generated
 	 * @ordered
@@ -47,9 +43,9 @@
 	protected static final String QUALIFIED_NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getQualifiedName() <em>Qualified Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getQualifiedName() <em>Qualified Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getQualifiedName()
 	 * @generated
 	 * @ordered
@@ -57,8 +53,8 @@
 	protected String qualifiedName = QUALIFIED_NAME_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorModuleReferenceImpl() {
@@ -66,8 +62,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,8 +72,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -86,8 +82,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -100,8 +96,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -114,8 +110,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -129,8 +125,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -144,8 +140,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -159,8 +155,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -177,8 +173,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -195,8 +191,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -211,4 +207,4 @@
 		return result.toString();
 	}
 
-} //ErrorModuleReferenceImpl
+} // ErrorModuleReferenceImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorProtectedAreaImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorProtectedAreaImpl.java
index 6545d18..a3cdd1b 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorProtectedAreaImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorProtectedAreaImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,39 +17,38 @@
 import org.eclipse.acceleo.Expression;
 import org.eclipse.acceleo.ProtectedArea;
 import org.eclipse.acceleo.Statement;
-
 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.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error Protected Area</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Protected Area</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl#getBody <em>Body</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl#getMissingEndHeader <em>Missing End Header</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl#getMissingOpenParenthesis <em>Missing Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl#getMissingCloseParenthesis <em>Missing Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl#getMissingEndHeader <em>Missing End
+ * Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorProtectedAreaImpl#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorProtectedAreaImpl extends MinimalEObjectImpl.Container implements ErrorProtectedArea {
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -57,9 +56,9 @@
 	protected Expression id;
 
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -67,9 +66,9 @@
 	protected Block body;
 
 	/**
-	 * The default value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -77,9 +76,9 @@
 	protected static final int MISSING_OPEN_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -87,9 +86,9 @@
 	protected int missingOpenParenthesis = MISSING_OPEN_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -97,9 +96,9 @@
 	protected static final int MISSING_CLOSE_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -107,9 +106,9 @@
 	protected int missingCloseParenthesis = MISSING_CLOSE_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -117,9 +116,9 @@
 	protected static final int MISSING_END_HEADER_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -127,9 +126,9 @@
 	protected int missingEndHeader = MISSING_END_HEADER_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -137,9 +136,9 @@
 	protected static final int MISSING_END_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -147,8 +146,8 @@
 	protected int missingEnd = MISSING_END_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorProtectedAreaImpl() {
@@ -156,8 +155,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -166,8 +165,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -176,8 +175,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetId(Expression newId, NotificationChain msgs) {
@@ -195,8 +194,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -218,8 +217,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -228,8 +227,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(Block newBody, NotificationChain msgs) {
@@ -247,8 +246,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -270,8 +269,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -280,8 +279,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -295,8 +294,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -305,8 +304,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -320,8 +319,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -330,8 +329,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -345,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -355,8 +354,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -369,8 +368,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -385,8 +384,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -409,8 +408,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -439,8 +438,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -469,8 +468,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -493,8 +492,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -519,8 +518,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -545,8 +544,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -567,4 +566,4 @@
 		return result.toString();
 	}
 
-} //ErrorProtectedAreaImpl
+} // ErrorProtectedAreaImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorQueryImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorQueryImpl.java
index 6d60502..9eb9b93 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorQueryImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorQueryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -42,32 +42,34 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getDocumentation <em>Documentation</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#isDeprecated <em>Deprecated</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getTypeAql <em>Type Aql</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getVisibility <em>Visibility</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getBody <em>Body</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingVisibility <em>Missing Visibility</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingName <em>Missing Name</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingParameters <em>Missing Parameters</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingColon <em>Missing Colon</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingType <em>Missing Type</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingEqual <em>Missing Equal</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getDocumentation <em>Documentation</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#isDeprecated <em>Deprecated</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getTypeAql <em>Type Aql</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getParameters <em>Parameters</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getVisibility <em>Visibility</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingVisibility <em>Missing Visibility</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingName <em>Missing Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingOpenParenthesis <em>Missing Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingParameters <em>Missing Parameters</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingCloseParenthesis <em>Missing Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingColon <em>Missing Colon</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingType <em>Missing Type</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingEqual <em>Missing Equal</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorQueryImpl#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorQueryImpl extends MinimalEObjectImpl.Container implements ErrorQuery {
 	/**
-	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDocumentation()
 	 * @generated
 	 * @ordered
@@ -75,9 +77,9 @@
 	protected Documentation documentation;
 
 	/**
-	 * The default value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute.
-	 * <!-- begin-user-doc
+	 * The default value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDeprecated()
 	 * @generated
 	 * @ordered
@@ -85,9 +87,9 @@
 	protected static final boolean DEPRECATED_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute.
-	 * <!-- begin-user-doc
+	 * The cached value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDeprecated()
 	 * @generated
 	 * @ordered
@@ -95,9 +97,9 @@
 	protected boolean deprecated = DEPRECATED_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -105,9 +107,9 @@
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -115,9 +117,9 @@
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -125,9 +127,9 @@
 	protected static final AstResult TYPE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -155,9 +157,9 @@
 	protected EList<Variable> parameters;
 
 	/**
-	 * The default value of the '{@link #getVisibility() <em>Visibility</em>}' attribute.
-	 * <!-- begin-user-doc
+	 * The default value of the '{@link #getVisibility() <em>Visibility</em>}' attribute. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getVisibility()
 	 * @generated
 	 * @ordered
@@ -165,9 +167,9 @@
 	protected static final VisibilityKind VISIBILITY_EDEFAULT = VisibilityKind.PRIVATE;
 
 	/**
-	 * The cached value of the '{@link #getVisibility() <em>Visibility</em>}' attribute.
-	 * <!-- begin-user-doc
+	 * The cached value of the '{@link #getVisibility() <em>Visibility</em>}' attribute. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getVisibility()
 	 * @generated
 	 * @ordered
@@ -175,9 +177,9 @@
 	protected VisibilityKind visibility = VISIBILITY_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -225,8 +227,9 @@
 	protected int missingName = MISSING_NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -234,8 +237,9 @@
 	protected static final int MISSING_OPEN_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -263,8 +267,9 @@
 	protected int missingParameters = MISSING_PARAMETERS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -272,8 +277,9 @@
 	protected static final int MISSING_CLOSE_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -341,9 +347,9 @@
 	protected int missingEqual = MISSING_EQUAL_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc
+	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -351,9 +357,9 @@
 	protected static final int MISSING_END_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc
+	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -362,6 +368,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorQueryImpl() {
@@ -370,6 +377,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -379,6 +387,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -396,8 +405,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Documentation basicGetDocumentation() {
@@ -406,6 +415,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDocumentation(Documentation newDocumentation, NotificationChain msgs) {
@@ -424,6 +434,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -446,6 +457,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -455,6 +467,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -468,6 +481,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -477,6 +491,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -490,6 +505,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -499,6 +515,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -512,6 +529,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -521,6 +539,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTypeAql(org.eclipse.acceleo.query.ast.Expression newTypeAql,
@@ -540,6 +559,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -562,6 +582,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -575,6 +596,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -584,6 +606,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -597,6 +620,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -606,6 +630,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(Expression newBody, NotificationChain msgs) {
@@ -624,6 +649,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -646,6 +672,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -655,6 +682,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -668,6 +696,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -677,6 +706,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -690,6 +720,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -699,6 +730,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -713,6 +745,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -722,6 +755,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -735,6 +769,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -744,6 +779,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -758,6 +794,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -767,6 +804,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -780,6 +818,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -789,6 +828,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -802,6 +842,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -811,6 +852,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -824,6 +866,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -833,6 +876,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -846,6 +890,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -862,6 +907,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -881,6 +927,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -928,6 +975,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -992,6 +1040,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1054,6 +1103,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1099,6 +1149,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1154,6 +1205,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1209,6 +1261,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorTemplateImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorTemplateImpl.java
index 5387563..d06caa3 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorTemplateImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorTemplateImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,6 +12,7 @@
 package org.eclipse.acceleo.impl;
 
 import java.util.Collection;
+
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.Block;
 import org.eclipse.acceleo.Documentation;
@@ -23,57 +24,58 @@
 import org.eclipse.acceleo.Template;
 import org.eclipse.acceleo.Variable;
 import org.eclipse.acceleo.VisibilityKind;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error Template</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Template</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getDocumentation <em>Documentation</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#isDeprecated <em>Deprecated</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getGuard <em>Guard</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getPost <em>Post</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#isMain <em>Main</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getVisibility <em>Visibility</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getBody <em>Body</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingVisibility <em>Missing Visibility</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingName <em>Missing Name</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingOpenParenthesis <em>Missing Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingParameters <em>Missing Parameters</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingCloseParenthesis <em>Missing Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingGuardOpenParenthesis <em>Missing Guard Open Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingGuardCloseParenthesis <em>Missing Guard Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingPostCloseParenthesis <em>Missing Post Close Parenthesis</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingEndHeader <em>Missing End Header</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingEnd <em>Missing End</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getDocumentation <em>Documentation</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#isDeprecated <em>Deprecated</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getParameters <em>Parameters</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getGuard <em>Guard</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getPost <em>Post</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#isMain <em>Main</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getVisibility <em>Visibility</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingVisibility <em>Missing
+ * Visibility</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingName <em>Missing Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingOpenParenthesis <em>Missing Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingParameters <em>Missing
+ * Parameters</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingCloseParenthesis <em>Missing Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingGuardOpenParenthesis <em>Missing Guard Open
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingGuardCloseParenthesis <em>Missing Guard
+ * Close Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingPostCloseParenthesis <em>Missing Post Close
+ * Parenthesis</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingEndHeader <em>Missing End Header</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorTemplateImpl#getMissingEnd <em>Missing End</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorTemplateImpl extends MinimalEObjectImpl.Container implements ErrorTemplate {
 	/**
-	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDocumentation()
 	 * @generated
 	 * @ordered
@@ -81,9 +83,9 @@
 	protected Documentation documentation;
 
 	/**
-	 * The default value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDeprecated()
 	 * @generated
 	 * @ordered
@@ -91,9 +93,9 @@
 	protected static final boolean DEPRECATED_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDeprecated()
 	 * @generated
 	 * @ordered
@@ -101,9 +103,9 @@
 	protected boolean deprecated = DEPRECATED_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -111,9 +113,9 @@
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -121,9 +123,9 @@
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getParameters()
 	 * @generated
 	 * @ordered
@@ -131,9 +133,9 @@
 	protected EList<Variable> parameters;
 
 	/**
-	 * The cached value of the '{@link #getGuard() <em>Guard</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getGuard() <em>Guard</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getGuard()
 	 * @generated
 	 * @ordered
@@ -141,9 +143,9 @@
 	protected Expression guard;
 
 	/**
-	 * The cached value of the '{@link #getPost() <em>Post</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getPost() <em>Post</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPost()
 	 * @generated
 	 * @ordered
@@ -151,9 +153,9 @@
 	protected Expression post;
 
 	/**
-	 * The default value of the '{@link #isMain() <em>Main</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isMain() <em>Main</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isMain()
 	 * @generated
 	 * @ordered
@@ -161,9 +163,9 @@
 	protected static final boolean MAIN_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isMain() <em>Main</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isMain() <em>Main</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isMain()
 	 * @generated
 	 * @ordered
@@ -171,9 +173,9 @@
 	protected boolean main = MAIN_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getVisibility() <em>Visibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getVisibility() <em>Visibility</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getVisibility()
 	 * @generated
 	 * @ordered
@@ -181,9 +183,9 @@
 	protected static final VisibilityKind VISIBILITY_EDEFAULT = VisibilityKind.PRIVATE;
 
 	/**
-	 * The cached value of the '{@link #getVisibility() <em>Visibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getVisibility() <em>Visibility</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getVisibility()
 	 * @generated
 	 * @ordered
@@ -191,9 +193,9 @@
 	protected VisibilityKind visibility = VISIBILITY_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -201,9 +203,9 @@
 	protected Block body;
 
 	/**
-	 * The default value of the '{@link #getMissingVisibility() <em>Missing Visibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingVisibility() <em>Missing Visibility</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingVisibility()
 	 * @generated
 	 * @ordered
@@ -211,9 +213,9 @@
 	protected static final int MISSING_VISIBILITY_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingVisibility() <em>Missing Visibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingVisibility() <em>Missing Visibility</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingVisibility()
 	 * @generated
 	 * @ordered
@@ -221,9 +223,9 @@
 	protected int missingVisibility = MISSING_VISIBILITY_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingName() <em>Missing Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingName() <em>Missing Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingName()
 	 * @generated
 	 * @ordered
@@ -231,9 +233,9 @@
 	protected static final int MISSING_NAME_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingName() <em>Missing Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingName() <em>Missing Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingName()
 	 * @generated
 	 * @ordered
@@ -241,9 +243,9 @@
 	protected int missingName = MISSING_NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -251,9 +253,9 @@
 	protected static final int MISSING_OPEN_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingOpenParenthesis() <em>Missing Open Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -261,9 +263,9 @@
 	protected int missingOpenParenthesis = MISSING_OPEN_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingParameters() <em>Missing Parameters</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingParameters() <em>Missing Parameters</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingParameters()
 	 * @generated
 	 * @ordered
@@ -271,9 +273,9 @@
 	protected static final int MISSING_PARAMETERS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingParameters() <em>Missing Parameters</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingParameters() <em>Missing Parameters</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingParameters()
 	 * @generated
 	 * @ordered
@@ -281,9 +283,9 @@
 	protected int missingParameters = MISSING_PARAMETERS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -291,9 +293,9 @@
 	protected static final int MISSING_CLOSE_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingCloseParenthesis() <em>Missing Close Parenthesis</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -301,9 +303,9 @@
 	protected int missingCloseParenthesis = MISSING_CLOSE_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingGuardOpenParenthesis() <em>Missing Guard Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingGuardOpenParenthesis() <em>Missing Guard Open
+	 * Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingGuardOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -311,9 +313,9 @@
 	protected static final int MISSING_GUARD_OPEN_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingGuardOpenParenthesis() <em>Missing Guard Open Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingGuardOpenParenthesis() <em>Missing Guard Open
+	 * Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingGuardOpenParenthesis()
 	 * @generated
 	 * @ordered
@@ -321,9 +323,9 @@
 	protected int missingGuardOpenParenthesis = MISSING_GUARD_OPEN_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingGuardCloseParenthesis() <em>Missing Guard Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingGuardCloseParenthesis() <em>Missing Guard Close
+	 * Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingGuardCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -331,9 +333,9 @@
 	protected static final int MISSING_GUARD_CLOSE_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingGuardCloseParenthesis() <em>Missing Guard Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingGuardCloseParenthesis() <em>Missing Guard Close
+	 * Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingGuardCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -341,9 +343,9 @@
 	protected int missingGuardCloseParenthesis = MISSING_GUARD_CLOSE_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingPostCloseParenthesis() <em>Missing Post Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingPostCloseParenthesis() <em>Missing Post Close
+	 * Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingPostCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -351,9 +353,9 @@
 	protected static final int MISSING_POST_CLOSE_PARENTHESIS_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingPostCloseParenthesis() <em>Missing Post Close Parenthesis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingPostCloseParenthesis() <em>Missing Post Close
+	 * Parenthesis</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingPostCloseParenthesis()
 	 * @generated
 	 * @ordered
@@ -361,9 +363,9 @@
 	protected int missingPostCloseParenthesis = MISSING_POST_CLOSE_PARENTHESIS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -371,9 +373,9 @@
 	protected static final int MISSING_END_HEADER_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEndHeader() <em>Missing End Header</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEndHeader()
 	 * @generated
 	 * @ordered
@@ -381,9 +383,9 @@
 	protected int missingEndHeader = MISSING_END_HEADER_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -391,9 +393,9 @@
 	protected static final int MISSING_END_EDEFAULT = -1;
 
 	/**
-	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMissingEnd() <em>Missing End</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMissingEnd()
 	 * @generated
 	 * @ordered
@@ -401,8 +403,8 @@
 	protected int missingEnd = MISSING_END_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorTemplateImpl() {
@@ -410,8 +412,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -420,8 +422,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -439,8 +441,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Documentation basicGetDocumentation() {
@@ -448,8 +450,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDocumentation(Documentation newDocumentation, NotificationChain msgs) {
@@ -467,8 +469,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -490,8 +492,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -500,8 +502,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -514,8 +516,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -524,8 +526,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -538,8 +540,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -552,8 +554,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -562,8 +564,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetGuard(Expression newGuard, NotificationChain msgs) {
@@ -581,8 +583,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -604,8 +606,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -614,8 +616,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetPost(Expression newPost, NotificationChain msgs) {
@@ -633,8 +635,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -656,8 +658,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -666,8 +668,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -680,8 +682,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -690,8 +692,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -704,8 +706,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -714,8 +716,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(Block newBody, NotificationChain msgs) {
@@ -733,8 +735,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -756,8 +758,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -766,8 +768,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -781,8 +783,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -791,8 +793,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -805,8 +807,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -815,8 +817,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -830,8 +832,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -840,8 +842,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -855,8 +857,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -865,8 +867,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -880,8 +882,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -890,8 +892,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -905,8 +907,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -915,8 +917,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -930,8 +932,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -940,8 +942,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -955,8 +957,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -965,8 +967,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -980,8 +982,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -990,8 +992,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1004,8 +1006,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1021,8 +1023,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1043,8 +1045,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1095,8 +1097,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -1166,8 +1168,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1235,8 +1237,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1285,8 +1287,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1337,8 +1339,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1389,8 +1391,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1431,4 +1433,4 @@
 		return result.toString();
 	}
 
-} //ErrorTemplateImpl
+} // ErrorTemplateImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorVariableImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorVariableImpl.java
index 02789a4..221ae36 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorVariableImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ErrorVariableImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -32,21 +32,21 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorVariableImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorVariableImpl#getTypeAql <em>Type Aql</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorVariableImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorVariableImpl#getMissingName <em>Missing Name</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorVariableImpl#getMissingColon <em>Missing Colon</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ErrorVariableImpl#getMissingType <em>Missing Type</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorVariableImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorVariableImpl#getTypeAql <em>Type Aql</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorVariableImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorVariableImpl#getMissingName <em>Missing Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorVariableImpl#getMissingColon <em>Missing Colon</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ErrorVariableImpl#getMissingType <em>Missing Type</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ErrorVariableImpl extends MinimalEObjectImpl.Container implements ErrorVariable {
 	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -54,9 +54,9 @@
 	protected static final AstResult TYPE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -74,9 +74,9 @@
 	protected Expression typeAql;
 
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -84,9 +84,9 @@
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -155,6 +155,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ErrorVariableImpl() {
@@ -163,6 +164,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -172,6 +174,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -181,6 +184,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -194,6 +198,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -203,6 +208,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTypeAql(Expression newTypeAql, NotificationChain msgs) {
@@ -221,6 +227,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -243,6 +250,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -252,6 +260,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -265,6 +274,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -274,6 +284,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,6 +298,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -296,6 +308,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -309,6 +322,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -318,6 +332,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -331,6 +346,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -344,6 +360,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -367,6 +384,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -396,6 +414,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -425,6 +444,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -448,6 +468,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -481,6 +502,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -514,6 +536,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ExpressionImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ExpressionImpl.java
index 1bedb6c..8c4a6db 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ExpressionImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ExpressionImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -15,33 +15,30 @@
 import org.eclipse.acceleo.Expression;
 import org.eclipse.acceleo.query.parser.AstResult;
 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.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Expression</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Expression</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ExpressionImpl#getAst <em>Ast</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ExpressionImpl#getAql <em>Aql</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ExpressionImpl#getAst <em>Ast</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ExpressionImpl#getAql <em>Aql</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ExpressionImpl extends MinimalEObjectImpl.Container implements Expression {
 	/**
-	 * The default value of the '{@link #getAst() <em>Ast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAst() <em>Ast</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAst()
 	 * @generated
 	 * @ordered
@@ -49,9 +46,9 @@
 	protected static final AstResult AST_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getAst() <em>Ast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAst() <em>Ast</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAst()
 	 * @generated
 	 * @ordered
@@ -59,9 +56,9 @@
 	protected AstResult ast = AST_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getAql() <em>Aql</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getAql() <em>Aql</em>}' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAql()
 	 * @generated
 	 * @ordered
@@ -69,8 +66,8 @@
 	protected org.eclipse.acceleo.query.ast.Expression aql;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ExpressionImpl() {
@@ -78,8 +75,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -88,8 +85,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -98,8 +95,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -112,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -122,8 +119,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetAql(org.eclipse.acceleo.query.ast.Expression newAql,
@@ -142,8 +139,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -165,8 +162,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -179,8 +176,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -195,8 +192,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -213,8 +210,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -231,8 +228,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -247,8 +244,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -263,4 +260,4 @@
 		return result.toString();
 	}
 
-} //ExpressionImpl
+} // ExpressionImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ExpressionStatementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ExpressionStatementImpl.java
index fe57d70..b0639b1 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ExpressionStatementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ExpressionStatementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,33 +14,29 @@
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.Expression;
 import org.eclipse.acceleo.ExpressionStatement;
-
 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;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Expression Statement</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Expression Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ExpressionStatementImpl#getExpression <em>Expression</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ExpressionStatementImpl#getExpression <em>Expression</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ExpressionStatementImpl extends LeafStatementImpl implements ExpressionStatement {
 	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getExpression()
 	 * @generated
 	 * @ordered
@@ -48,8 +44,8 @@
 	protected Expression expression;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ExpressionStatementImpl() {
@@ -57,8 +53,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,8 +63,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -77,8 +73,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetExpression(Expression newExpression, NotificationChain msgs) {
@@ -96,8 +92,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -119,8 +115,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -133,8 +129,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -147,8 +143,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -162,8 +158,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -177,8 +173,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -190,4 +186,4 @@
 		return super.eIsSet(featureID);
 	}
 
-} //ExpressionStatementImpl
+} // ExpressionStatementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/FileStatementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/FileStatementImpl.java
index 10b943e..e70b546 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/FileStatementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/FileStatementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,37 +16,33 @@
 import org.eclipse.acceleo.Expression;
 import org.eclipse.acceleo.FileStatement;
 import org.eclipse.acceleo.OpenModeKind;
-
 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.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>File Statement</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>File Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.FileStatementImpl#getMode <em>Mode</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.FileStatementImpl#getUrl <em>Url</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.FileStatementImpl#getCharset <em>Charset</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.FileStatementImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.FileStatementImpl#getMode <em>Mode</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.FileStatementImpl#getUrl <em>Url</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.FileStatementImpl#getCharset <em>Charset</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.FileStatementImpl#getBody <em>Body</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class FileStatementImpl extends MinimalEObjectImpl.Container implements FileStatement {
 	/**
-	 * The default value of the '{@link #getMode() <em>Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getMode() <em>Mode</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMode()
 	 * @generated
 	 * @ordered
@@ -54,9 +50,9 @@
 	protected static final OpenModeKind MODE_EDEFAULT = OpenModeKind.OVERWRITE;
 
 	/**
-	 * The cached value of the '{@link #getMode() <em>Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMode() <em>Mode</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getMode()
 	 * @generated
 	 * @ordered
@@ -64,9 +60,9 @@
 	protected OpenModeKind mode = MODE_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getUrl() <em>Url</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getUrl() <em>Url</em>}' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getUrl()
 	 * @generated
 	 * @ordered
@@ -74,9 +70,9 @@
 	protected Expression url;
 
 	/**
-	 * The cached value of the '{@link #getCharset() <em>Charset</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCharset() <em>Charset</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getCharset()
 	 * @generated
 	 * @ordered
@@ -84,9 +80,9 @@
 	protected Expression charset;
 
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -94,8 +90,8 @@
 	protected Block body;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected FileStatementImpl() {
@@ -103,8 +99,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,8 +119,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -137,8 +133,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -147,8 +143,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetUrl(Expression newUrl, NotificationChain msgs) {
@@ -166,8 +162,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -189,8 +185,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -199,8 +195,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetCharset(Expression newCharset, NotificationChain msgs) {
@@ -218,8 +214,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -241,8 +237,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,8 +247,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(Block newBody, NotificationChain msgs) {
@@ -270,8 +266,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -293,8 +289,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -311,8 +307,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -331,8 +327,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -355,8 +351,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -379,8 +375,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -399,8 +395,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -415,4 +411,4 @@
 		return result.toString();
 	}
 
-} //FileStatementImpl
+} // FileStatementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ForStatementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ForStatementImpl.java
index 6c42d72..53dc800 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ForStatementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ForStatementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,36 +16,32 @@
 import org.eclipse.acceleo.Block;
 import org.eclipse.acceleo.Expression;
 import org.eclipse.acceleo.ForStatement;
-
 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.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>For Statement</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>For Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ForStatementImpl#getBinding <em>Binding</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ForStatementImpl#getSeparator <em>Separator</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ForStatementImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ForStatementImpl#getBinding <em>Binding</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ForStatementImpl#getSeparator <em>Separator</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ForStatementImpl#getBody <em>Body</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ForStatementImpl extends MinimalEObjectImpl.Container implements ForStatement {
 	/**
-	 * The cached value of the '{@link #getBinding() <em>Binding</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBinding() <em>Binding</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBinding()
 	 * @generated
 	 * @ordered
@@ -53,9 +49,9 @@
 	protected Binding binding;
 
 	/**
-	 * The cached value of the '{@link #getSeparator() <em>Separator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSeparator() <em>Separator</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSeparator()
 	 * @generated
 	 * @ordered
@@ -63,9 +59,9 @@
 	protected Expression separator;
 
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -73,8 +69,8 @@
 	protected Block body;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ForStatementImpl() {
@@ -82,8 +78,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -92,8 +88,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -102,8 +98,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBinding(Binding newBinding, NotificationChain msgs) {
@@ -121,8 +117,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -144,8 +140,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -154,8 +150,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetSeparator(Expression newSeparator, NotificationChain msgs) {
@@ -173,8 +169,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -196,8 +192,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -206,8 +202,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(Block newBody, NotificationChain msgs) {
@@ -225,8 +221,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -248,8 +244,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,8 +262,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -284,8 +280,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -305,8 +301,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -326,8 +322,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -343,4 +339,4 @@
 		return super.eIsSet(featureID);
 	}
 
-} //ForStatementImpl
+} // ForStatementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/IfStatementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/IfStatementImpl.java
index 79e6513..2075daf 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/IfStatementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/IfStatementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -15,36 +15,32 @@
 import org.eclipse.acceleo.Block;
 import org.eclipse.acceleo.Expression;
 import org.eclipse.acceleo.IfStatement;
-
 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.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>If Statement</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>If Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.IfStatementImpl#getCondition <em>Condition</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.IfStatementImpl#getThen <em>Then</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.IfStatementImpl#getElse <em>Else</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.IfStatementImpl#getCondition <em>Condition</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.IfStatementImpl#getThen <em>Then</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.IfStatementImpl#getElse <em>Else</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class IfStatementImpl extends MinimalEObjectImpl.Container implements IfStatement {
 	/**
-	 * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getCondition()
 	 * @generated
 	 * @ordered
@@ -52,9 +48,9 @@
 	protected Expression condition;
 
 	/**
-	 * The cached value of the '{@link #getThen() <em>Then</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getThen() <em>Then</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getThen()
 	 * @generated
 	 * @ordered
@@ -62,9 +58,9 @@
 	protected Block then;
 
 	/**
-	 * The cached value of the '{@link #getElse() <em>Else</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getElse() <em>Else</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getElse()
 	 * @generated
 	 * @ordered
@@ -72,8 +68,8 @@
 	protected Block else_;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IfStatementImpl() {
@@ -81,8 +77,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -91,8 +87,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -101,8 +97,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetCondition(Expression newCondition, NotificationChain msgs) {
@@ -120,8 +116,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -143,8 +139,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -153,8 +149,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetThen(Block newThen, NotificationChain msgs) {
@@ -172,8 +168,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -195,8 +191,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -205,8 +201,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetElse(Block newElse, NotificationChain msgs) {
@@ -224,8 +220,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -247,8 +243,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -265,8 +261,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -283,8 +279,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -304,8 +300,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -325,8 +321,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -342,4 +338,4 @@
 		return super.eIsSet(featureID);
 	}
 
-} //IfStatementImpl
+} // IfStatementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ImportImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ImportImpl.java
index c9bf41a..37d3190 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ImportImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ImportImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -13,7 +13,6 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.Import;
-
 import org.eclipse.acceleo.ModuleReference;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -23,23 +22,22 @@
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Import</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Import</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ImportImpl#getModule <em>Module</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ImportImpl#getModule <em>Module</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ImportImpl extends MinimalEObjectImpl.Container implements Import {
 	/**
-	 * The cached value of the '{@link #getModule() <em>Module</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getModule() <em>Module</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getModule()
 	 * @generated
 	 * @ordered
@@ -47,8 +45,8 @@
 	protected ModuleReference module;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ImportImpl() {
@@ -56,8 +54,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -66,8 +64,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,8 +74,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetModule(ModuleReference newModule, NotificationChain msgs) {
@@ -95,8 +93,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -118,8 +116,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -132,8 +130,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -146,8 +144,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -161,8 +159,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -176,8 +174,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -189,4 +187,4 @@
 		return super.eIsSet(featureID);
 	}
 
-} //ImportImpl
+} // ImportImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/LeafStatementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/LeafStatementImpl.java
index 20a2e89..751865b 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/LeafStatementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/LeafStatementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -13,32 +13,28 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.LeafStatement;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Leaf Statement</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Leaf Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.LeafStatementImpl#isNewLineNeeded <em>New Line Needed</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.LeafStatementImpl#isNewLineNeeded <em>New Line Needed</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class LeafStatementImpl extends MinimalEObjectImpl.Container implements LeafStatement {
 	/**
-	 * The default value of the '{@link #isNewLineNeeded() <em>New Line Needed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isNewLineNeeded() <em>New Line Needed</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isNewLineNeeded()
 	 * @generated
 	 * @ordered
@@ -46,9 +42,9 @@
 	protected static final boolean NEW_LINE_NEEDED_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isNewLineNeeded() <em>New Line Needed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isNewLineNeeded() <em>New Line Needed</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isNewLineNeeded()
 	 * @generated
 	 * @ordered
@@ -56,8 +52,8 @@
 	protected boolean newLineNeeded = NEW_LINE_NEEDED_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LeafStatementImpl() {
@@ -65,8 +61,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -75,8 +71,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -85,8 +81,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,8 +95,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,8 +124,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -143,8 +139,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -157,8 +153,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -173,4 +169,4 @@
 		return result.toString();
 	}
 
-} //LeafStatementImpl
+} // LeafStatementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/LetStatementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/LetStatementImpl.java
index 6623fd0..27ccbd0 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/LetStatementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/LetStatementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,40 +17,34 @@
 import org.eclipse.acceleo.Binding;
 import org.eclipse.acceleo.Block;
 import org.eclipse.acceleo.LetStatement;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Let Statement</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Let Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.LetStatementImpl#getVariables <em>Variables</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.LetStatementImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.LetStatementImpl#getVariables <em>Variables</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.LetStatementImpl#getBody <em>Body</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class LetStatementImpl extends MinimalEObjectImpl.Container implements LetStatement {
 	/**
-	 * The cached value of the '{@link #getVariables() <em>Variables</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getVariables() <em>Variables</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getVariables()
 	 * @generated
 	 * @ordered
@@ -58,9 +52,9 @@
 	protected EList<Binding> variables;
 
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -68,8 +62,8 @@
 	protected Block body;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LetStatementImpl() {
@@ -77,8 +71,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,8 +81,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -101,8 +95,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -111,8 +105,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(Block newBody, NotificationChain msgs) {
@@ -130,8 +124,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -153,8 +147,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -169,8 +163,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -185,8 +179,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -205,8 +199,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -223,8 +217,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,4 +232,4 @@
 		return super.eIsSet(featureID);
 	}
 
-} //LetStatementImpl
+} // LetStatementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/MetamodelImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/MetamodelImpl.java
index 96a2e1f..6113296 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/MetamodelImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/MetamodelImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -13,34 +13,30 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.Metamodel;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Metamodel</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Metamodel</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.MetamodelImpl#getReferencedPackage <em>Referenced Package</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.MetamodelImpl#getReferencedPackage <em>Referenced Package</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class MetamodelImpl extends MinimalEObjectImpl.Container implements Metamodel {
 	/**
-	 * The cached value of the '{@link #getReferencedPackage() <em>Referenced Package</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getReferencedPackage() <em>Referenced Package</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getReferencedPackage()
 	 * @generated
 	 * @ordered
@@ -48,8 +44,8 @@
 	protected EPackage referencedPackage;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MetamodelImpl() {
@@ -57,8 +53,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,8 +63,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,8 +83,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EPackage basicGetReferencedPackage() {
@@ -96,8 +92,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -110,8 +106,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -126,8 +122,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -141,8 +137,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -156,8 +152,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -169,4 +165,4 @@
 		return super.eIsSet(featureID);
 	}
 
-} //MetamodelImpl
+} // MetamodelImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleDocumentationImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleDocumentationImpl.java
index 71f5972..4c95248 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleDocumentationImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleDocumentationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,36 +14,33 @@
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.DocumentedElement;
 import org.eclipse.acceleo.ModuleDocumentation;
-
 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;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Module Documentation</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Module Documentation</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleDocumentationImpl#getDocumentedElement <em>Documented Element</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleDocumentationImpl#getAuthor <em>Author</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleDocumentationImpl#getVersion <em>Version</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleDocumentationImpl#getSince <em>Since</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleDocumentationImpl#getDocumentedElement <em>Documented
+ * Element</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleDocumentationImpl#getAuthor <em>Author</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleDocumentationImpl#getVersion <em>Version</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleDocumentationImpl#getSince <em>Since</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ModuleDocumentationImpl extends CommentImpl implements ModuleDocumentation {
 	/**
-	 * The cached value of the '{@link #getDocumentedElement() <em>Documented Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDocumentedElement() <em>Documented Element</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDocumentedElement()
 	 * @generated
 	 * @ordered
@@ -51,9 +48,9 @@
 	protected DocumentedElement documentedElement;
 
 	/**
-	 * The default value of the '{@link #getAuthor() <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAuthor() <em>Author</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAuthor()
 	 * @generated
 	 * @ordered
@@ -61,9 +58,9 @@
 	protected static final String AUTHOR_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getAuthor() <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAuthor() <em>Author</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAuthor()
 	 * @generated
 	 * @ordered
@@ -71,9 +68,9 @@
 	protected String author = AUTHOR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVersion()
 	 * @generated
 	 * @ordered
@@ -81,9 +78,9 @@
 	protected static final String VERSION_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getVersion()
 	 * @generated
 	 * @ordered
@@ -91,9 +88,9 @@
 	protected String version = VERSION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSince() <em>Since</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getSince() <em>Since</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSince()
 	 * @generated
 	 * @ordered
@@ -101,9 +98,9 @@
 	protected static final String SINCE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getSince() <em>Since</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getSince() <em>Since</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getSince()
 	 * @generated
 	 * @ordered
@@ -111,8 +108,8 @@
 	protected String since = SINCE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ModuleDocumentationImpl() {
@@ -120,8 +117,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -130,8 +127,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -150,8 +147,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DocumentedElement basicGetDocumentedElement() {
@@ -159,8 +156,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDocumentedElement(DocumentedElement newDocumentedElement,
@@ -180,8 +177,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -204,8 +201,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -214,8 +211,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -228,8 +225,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,8 +235,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -252,8 +249,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -262,8 +259,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -276,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -293,8 +290,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -307,8 +304,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -329,8 +326,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -353,8 +350,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -377,8 +374,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -397,8 +394,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -417,4 +414,4 @@
 		return result.toString();
 	}
 
-} //ModuleDocumentationImpl
+} // ModuleDocumentationImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleElementDocumentationImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleElementDocumentationImpl.java
index ad575d9..6a5bdd8 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleElementDocumentationImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleElementDocumentationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,39 +17,35 @@
 import org.eclipse.acceleo.DocumentedElement;
 import org.eclipse.acceleo.ModuleElementDocumentation;
 import org.eclipse.acceleo.ParameterDocumentation;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Module Element Documentation</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Module Element
+ * Documentation</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleElementDocumentationImpl#getDocumentedElement <em>Documented Element</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleElementDocumentationImpl#getParameterDocumentation <em>Parameter Documentation</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleElementDocumentationImpl#getDocumentedElement <em>Documented
+ * Element</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleElementDocumentationImpl#getParameterDocumentation <em>Parameter
+ * Documentation</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ModuleElementDocumentationImpl extends CommentImpl implements ModuleElementDocumentation {
 	/**
-	 * The cached value of the '{@link #getDocumentedElement() <em>Documented Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDocumentedElement() <em>Documented Element</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDocumentedElement()
 	 * @generated
 	 * @ordered
@@ -57,9 +53,9 @@
 	protected DocumentedElement documentedElement;
 
 	/**
-	 * The cached value of the '{@link #getParameterDocumentation() <em>Parameter Documentation</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getParameterDocumentation() <em>Parameter Documentation</em>}'
+	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getParameterDocumentation()
 	 * @generated
 	 * @ordered
@@ -67,8 +63,8 @@
 	protected EList<ParameterDocumentation> parameterDocumentation;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ModuleElementDocumentationImpl() {
@@ -76,8 +72,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -86,8 +82,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -106,8 +102,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DocumentedElement basicGetDocumentedElement() {
@@ -115,8 +111,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDocumentedElement(DocumentedElement newDocumentedElement,
@@ -136,8 +132,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -160,8 +156,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -175,8 +171,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -192,8 +188,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -208,8 +204,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -226,8 +222,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -246,8 +242,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -264,8 +260,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -279,4 +275,4 @@
 		return super.eIsSet(featureID);
 	}
 
-} //ModuleElementDocumentationImpl
+} // ModuleElementDocumentationImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleElementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleElementImpl.java
index f3ed57a..fcdfc7e 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleElementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleElementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,16 +17,15 @@
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Module Element</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Module Element</b></em>'. <!--
+ * end-user-doc -->
  *
  * @generated
  */
 public abstract class ModuleElementImpl extends MinimalEObjectImpl.Container implements ModuleElement {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ModuleElementImpl() {
@@ -34,8 +33,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -43,4 +42,4 @@
 		return AcceleoPackage.Literals.MODULE_ELEMENT;
 	}
 
-} //ModuleElementImpl
+} // ModuleElementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleImpl.java
index 7df0d0c..33b9a2b 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -21,48 +21,42 @@
 import org.eclipse.acceleo.Metamodel;
 import org.eclipse.acceleo.ModuleElement;
 import org.eclipse.acceleo.ModuleReference;
-
 import org.eclipse.acceleo.aql.parser.AcceleoAstResult;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Module</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Module</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getDocumentation <em>Documentation</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleImpl#isDeprecated <em>Deprecated</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getMetamodels <em>Metamodels</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getExtends <em>Extends</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getImports <em>Imports</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getModuleElements <em>Module Elements</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getStartHeaderPosition <em>Start Header Position</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getEndHeaderPosition <em>End Header Position</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getAst <em>Ast</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getDocumentation <em>Documentation</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleImpl#isDeprecated <em>Deprecated</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getMetamodels <em>Metamodels</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getExtends <em>Extends</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getImports <em>Imports</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getModuleElements <em>Module Elements</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getStartHeaderPosition <em>Start Header Position</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getEndHeaderPosition <em>End Header Position</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleImpl#getAst <em>Ast</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ModuleImpl extends NamedElementImpl implements org.eclipse.acceleo.Module {
 	/**
-	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDocumentation()
 	 * @generated
 	 * @ordered
@@ -70,9 +64,9 @@
 	protected Documentation documentation;
 
 	/**
-	 * The default value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDeprecated()
 	 * @generated
 	 * @ordered
@@ -80,9 +74,9 @@
 	protected static final boolean DEPRECATED_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDeprecated()
 	 * @generated
 	 * @ordered
@@ -90,9 +84,9 @@
 	protected boolean deprecated = DEPRECATED_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getMetamodels() <em>Metamodels</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getMetamodels() <em>Metamodels</em>}' reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMetamodels()
 	 * @generated
 	 * @ordered
@@ -100,9 +94,9 @@
 	protected EList<Metamodel> metamodels;
 
 	/**
-	 * The cached value of the '{@link #getExtends() <em>Extends</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getExtends() <em>Extends</em>}' containment reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getExtends()
 	 * @generated
 	 * @ordered
@@ -110,9 +104,9 @@
 	protected ModuleReference extends_;
 
 	/**
-	 * The cached value of the '{@link #getImports() <em>Imports</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getImports() <em>Imports</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getImports()
 	 * @generated
 	 * @ordered
@@ -120,9 +114,9 @@
 	protected EList<Import> imports;
 
 	/**
-	 * The cached value of the '{@link #getModuleElements() <em>Module Elements</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getModuleElements() <em>Module Elements</em>}' containment reference
+	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getModuleElements()
 	 * @generated
 	 * @ordered
@@ -131,8 +125,8 @@
 
 	/**
 	 * The default value of the '{@link #getStartHeaderPosition() <em>Start Header Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStartHeaderPosition()
 	 * @generated
 	 * @ordered
@@ -141,8 +135,8 @@
 
 	/**
 	 * The cached value of the '{@link #getStartHeaderPosition() <em>Start Header Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStartHeaderPosition()
 	 * @generated
 	 * @ordered
@@ -150,9 +144,9 @@
 	protected int startHeaderPosition = START_HEADER_POSITION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getEndHeaderPosition() <em>End Header Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getEndHeaderPosition() <em>End Header Position</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getEndHeaderPosition()
 	 * @generated
 	 * @ordered
@@ -160,9 +154,9 @@
 	protected static final int END_HEADER_POSITION_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getEndHeaderPosition() <em>End Header Position</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getEndHeaderPosition() <em>End Header Position</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getEndHeaderPosition()
 	 * @generated
 	 * @ordered
@@ -170,9 +164,9 @@
 	protected int endHeaderPosition = END_HEADER_POSITION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getAst() <em>Ast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getAst() <em>Ast</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAst()
 	 * @generated
 	 * @ordered
@@ -180,9 +174,9 @@
 	protected static final AcceleoAstResult AST_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getAst() <em>Ast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getAst() <em>Ast</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getAst()
 	 * @generated
 	 * @ordered
@@ -190,8 +184,8 @@
 	protected AcceleoAstResult ast = AST_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ModuleImpl() {
@@ -199,8 +193,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -209,8 +203,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -228,8 +222,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Documentation basicGetDocumentation() {
@@ -237,8 +231,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDocumentation(Documentation newDocumentation, NotificationChain msgs) {
@@ -256,8 +250,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -279,8 +273,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -289,8 +283,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -303,8 +297,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -317,8 +311,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -327,8 +321,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetExtends(ModuleReference newExtends, NotificationChain msgs) {
@@ -346,8 +340,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -369,8 +363,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -382,8 +376,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -396,8 +390,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -406,8 +400,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -421,8 +415,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -431,8 +425,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -445,8 +439,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -455,8 +449,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -468,8 +462,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -485,8 +479,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -505,8 +499,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -537,8 +531,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -580,8 +574,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -619,8 +613,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -649,8 +643,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -675,8 +669,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -701,8 +695,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -723,4 +717,4 @@
 		return result.toString();
 	}
 
-} //ModuleImpl
+} // ModuleImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleReferenceImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleReferenceImpl.java
index 3cf3847..771d8d9 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleReferenceImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ModuleReferenceImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -13,32 +13,28 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ModuleReference;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Module Reference</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Module Reference</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ModuleReferenceImpl#getQualifiedName <em>Qualified Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ModuleReferenceImpl#getQualifiedName <em>Qualified Name</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ModuleReferenceImpl extends MinimalEObjectImpl.Container implements ModuleReference {
 	/**
-	 * The default value of the '{@link #getQualifiedName() <em>Qualified Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getQualifiedName() <em>Qualified Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getQualifiedName()
 	 * @generated
 	 * @ordered
@@ -46,9 +42,9 @@
 	protected static final String QUALIFIED_NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getQualifiedName() <em>Qualified Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getQualifiedName() <em>Qualified Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getQualifiedName()
 	 * @generated
 	 * @ordered
@@ -56,8 +52,8 @@
 	protected String qualifiedName = QUALIFIED_NAME_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ModuleReferenceImpl() {
@@ -65,8 +61,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -75,8 +71,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -85,8 +81,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,8 +95,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,8 +124,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -143,8 +139,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -158,8 +154,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -174,4 +170,4 @@
 		return result.toString();
 	}
 
-} //ModuleReferenceImpl
+} // ModuleReferenceImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/NamedElementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/NamedElementImpl.java
index 6d6666a..5202494 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/NamedElementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/NamedElementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -13,32 +13,28 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.NamedElement;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Named Element</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Named Element</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.NamedElementImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.NamedElementImpl#getName <em>Name</em>}</li>
  * </ul>
  *
  * @generated
  */
 public abstract class NamedElementImpl extends MinimalEObjectImpl.Container implements NamedElement {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -46,9 +42,9 @@
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -56,8 +52,8 @@
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected NamedElementImpl() {
@@ -65,8 +61,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -75,8 +71,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -85,8 +81,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,8 +95,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +109,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,8 +124,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -143,8 +139,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -157,8 +153,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -173,4 +169,4 @@
 		return result.toString();
 	}
 
-} //NamedElementImpl
+} // NamedElementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/NewLineStatementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/NewLineStatementImpl.java
index c3f8941..c1a27f4 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/NewLineStatementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/NewLineStatementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -13,31 +13,28 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.NewLineStatement;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>New Line Statement</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>New Line Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.NewLineStatementImpl#isIndentationNeeded <em>Indentation Needed</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.NewLineStatementImpl#isIndentationNeeded <em>Indentation
+ * Needed</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class NewLineStatementImpl extends TextStatementImpl implements NewLineStatement {
 	/**
-	 * The default value of the '{@link #isIndentationNeeded() <em>Indentation Needed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isIndentationNeeded() <em>Indentation Needed</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isIndentationNeeded()
 	 * @generated
 	 * @ordered
@@ -45,9 +42,9 @@
 	protected static final boolean INDENTATION_NEEDED_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isIndentationNeeded() <em>Indentation Needed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isIndentationNeeded() <em>Indentation Needed</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isIndentationNeeded()
 	 * @generated
 	 * @ordered
@@ -55,8 +52,8 @@
 	protected boolean indentationNeeded = INDENTATION_NEEDED_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected NewLineStatementImpl() {
@@ -64,8 +61,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,8 +71,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -84,8 +81,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,8 +96,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,8 +110,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,8 +125,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -143,8 +140,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -157,8 +154,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -173,4 +170,4 @@
 		return result.toString();
 	}
 
-} //NewLineStatementImpl
+} // NewLineStatementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ParameterDocumentationImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ParameterDocumentationImpl.java
index 236dfb7..2ca3ac2 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ParameterDocumentationImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ParameterDocumentationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -13,20 +13,18 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.ParameterDocumentation;
-
 import org.eclipse.emf.ecore.EClass;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Parameter Documentation</b></em>'.
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Parameter Documentation</b></em>'.
  * <!-- end-user-doc -->
  *
  * @generated
  */
 public class ParameterDocumentationImpl extends CommentImpl implements ParameterDocumentation {
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ParameterDocumentationImpl() {
@@ -34,8 +32,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -43,4 +41,4 @@
 		return AcceleoPackage.Literals.PARAMETER_DOCUMENTATION;
 	}
 
-} //ParameterDocumentationImpl
+} // ParameterDocumentationImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ProtectedAreaImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ProtectedAreaImpl.java
index 3a56d6c..ed9a4ea 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ProtectedAreaImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/ProtectedAreaImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -15,35 +15,31 @@
 import org.eclipse.acceleo.Block;
 import org.eclipse.acceleo.Expression;
 import org.eclipse.acceleo.ProtectedArea;
-
 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.emf.ecore.impl.MinimalEObjectImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Protected Area</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Protected Area</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.ProtectedAreaImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.ProtectedAreaImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ProtectedAreaImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.ProtectedAreaImpl#getBody <em>Body</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class ProtectedAreaImpl extends MinimalEObjectImpl.Container implements ProtectedArea {
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getId() <em>Id</em>}' containment reference. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -51,9 +47,9 @@
 	protected Expression id;
 
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -61,8 +57,8 @@
 	protected Block body;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ProtectedAreaImpl() {
@@ -70,8 +66,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -80,8 +76,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -90,8 +86,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetId(Expression newId, NotificationChain msgs) {
@@ -109,8 +105,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -132,8 +128,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -142,8 +138,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(Block newBody, NotificationChain msgs) {
@@ -161,8 +157,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -184,8 +180,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -200,8 +196,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -216,8 +212,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -234,8 +230,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -252,8 +248,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -267,4 +263,4 @@
 		return super.eIsSet(featureID);
 	}
 
-} //ProtectedAreaImpl
+} // ProtectedAreaImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/QueryImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/QueryImpl.java
index 656077d..6059dcf 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/QueryImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/QueryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -53,9 +53,9 @@
  */
 public class QueryImpl extends ModuleElementImpl implements Query {
 	/**
-	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDocumentation()
 	 * @generated
 	 * @ordered
@@ -63,9 +63,9 @@
 	protected Documentation documentation;
 
 	/**
-	 * The default value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute.
-	 * <!-- begin-user-doc
+	 * The default value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDeprecated()
 	 * @generated
 	 * @ordered
@@ -73,9 +73,9 @@
 	protected static final boolean DEPRECATED_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute.
-	 * <!-- begin-user-doc
+	 * The cached value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDeprecated()
 	 * @generated
 	 * @ordered
@@ -83,9 +83,9 @@
 	protected boolean deprecated = DEPRECATED_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -93,9 +93,9 @@
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -103,9 +103,9 @@
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -113,9 +113,9 @@
 	protected static final AstResult TYPE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -143,9 +143,9 @@
 	protected EList<Variable> parameters;
 
 	/**
-	 * The default value of the '{@link #getVisibility() <em>Visibility</em>}' attribute.
-	 * <!-- begin-user-doc
+	 * The default value of the '{@link #getVisibility() <em>Visibility</em>}' attribute. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getVisibility()
 	 * @generated
 	 * @ordered
@@ -153,9 +153,9 @@
 	protected static final VisibilityKind VISIBILITY_EDEFAULT = VisibilityKind.PRIVATE;
 
 	/**
-	 * The cached value of the '{@link #getVisibility() <em>Visibility</em>}' attribute.
-	 * <!-- begin-user-doc
+	 * The cached value of the '{@link #getVisibility() <em>Visibility</em>}' attribute. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getVisibility()
 	 * @generated
 	 * @ordered
@@ -163,9 +163,9 @@
 	protected VisibilityKind visibility = VISIBILITY_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -174,6 +174,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected QueryImpl() {
@@ -182,6 +183,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -191,6 +193,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -208,8 +211,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Documentation basicGetDocumentation() {
@@ -218,6 +221,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDocumentation(Documentation newDocumentation, NotificationChain msgs) {
@@ -236,6 +240,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -258,6 +263,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -267,6 +273,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -280,6 +287,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -289,6 +297,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -301,6 +310,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -310,6 +320,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -322,6 +333,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -331,6 +343,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTypeAql(org.eclipse.acceleo.query.ast.Expression newTypeAql,
@@ -350,6 +363,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -372,6 +386,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -385,6 +400,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -394,6 +410,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -407,6 +424,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -416,6 +434,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(Expression newBody, NotificationChain msgs) {
@@ -434,6 +453,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -456,6 +476,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -472,6 +493,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -491,6 +513,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -520,6 +543,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -557,6 +581,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -592,6 +617,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -619,6 +645,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -656,6 +683,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -693,6 +721,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/TemplateImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/TemplateImpl.java
index 6f42908..5149da3 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/TemplateImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/TemplateImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -22,46 +22,40 @@
 import org.eclipse.acceleo.Template;
 import org.eclipse.acceleo.Variable;
 import org.eclipse.acceleo.VisibilityKind;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Template</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Template</b></em>'. <!-- end-user-doc
+ * -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.TemplateImpl#getDocumentation <em>Documentation</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.TemplateImpl#isDeprecated <em>Deprecated</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.TemplateImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.TemplateImpl#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.TemplateImpl#getGuard <em>Guard</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.TemplateImpl#getPost <em>Post</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.TemplateImpl#isMain <em>Main</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.TemplateImpl#getVisibility <em>Visibility</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.TemplateImpl#getBody <em>Body</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.TemplateImpl#getDocumentation <em>Documentation</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.TemplateImpl#isDeprecated <em>Deprecated</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.TemplateImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.TemplateImpl#getParameters <em>Parameters</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.TemplateImpl#getGuard <em>Guard</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.TemplateImpl#getPost <em>Post</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.TemplateImpl#isMain <em>Main</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.TemplateImpl#getVisibility <em>Visibility</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.TemplateImpl#getBody <em>Body</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class TemplateImpl extends ModuleElementImpl implements Template {
 	/**
-	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' reference. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDocumentation()
 	 * @generated
 	 * @ordered
@@ -69,9 +63,9 @@
 	protected Documentation documentation;
 
 	/**
-	 * The default value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDeprecated()
 	 * @generated
 	 * @ordered
@@ -79,9 +73,9 @@
 	protected static final boolean DEPRECATED_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isDeprecated() <em>Deprecated</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #isDeprecated()
 	 * @generated
 	 * @ordered
@@ -89,9 +83,9 @@
 	protected boolean deprecated = DEPRECATED_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -99,9 +93,9 @@
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -109,9 +103,9 @@
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getParameters()
 	 * @generated
 	 * @ordered
@@ -119,9 +113,9 @@
 	protected EList<Variable> parameters;
 
 	/**
-	 * The cached value of the '{@link #getGuard() <em>Guard</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getGuard() <em>Guard</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getGuard()
 	 * @generated
 	 * @ordered
@@ -129,9 +123,9 @@
 	protected Expression guard;
 
 	/**
-	 * The cached value of the '{@link #getPost() <em>Post</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getPost() <em>Post</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPost()
 	 * @generated
 	 * @ordered
@@ -139,9 +133,9 @@
 	protected Expression post;
 
 	/**
-	 * The default value of the '{@link #isMain() <em>Main</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #isMain() <em>Main</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isMain()
 	 * @generated
 	 * @ordered
@@ -149,9 +143,9 @@
 	protected static final boolean MAIN_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isMain() <em>Main</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #isMain() <em>Main</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #isMain()
 	 * @generated
 	 * @ordered
@@ -159,9 +153,9 @@
 	protected boolean main = MAIN_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getVisibility() <em>Visibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getVisibility() <em>Visibility</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getVisibility()
 	 * @generated
 	 * @ordered
@@ -169,9 +163,9 @@
 	protected static final VisibilityKind VISIBILITY_EDEFAULT = VisibilityKind.PRIVATE;
 
 	/**
-	 * The cached value of the '{@link #getVisibility() <em>Visibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getVisibility() <em>Visibility</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getVisibility()
 	 * @generated
 	 * @ordered
@@ -179,9 +173,9 @@
 	protected VisibilityKind visibility = VISIBILITY_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBody()
 	 * @generated
 	 * @ordered
@@ -189,8 +183,8 @@
 	protected Block body;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TemplateImpl() {
@@ -198,8 +192,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -208,8 +202,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -227,8 +221,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Documentation basicGetDocumentation() {
@@ -236,8 +230,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDocumentation(Documentation newDocumentation, NotificationChain msgs) {
@@ -255,8 +249,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -278,8 +272,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -288,8 +282,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -302,8 +296,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -312,8 +306,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -326,8 +320,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -340,8 +334,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -350,8 +344,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetGuard(Expression newGuard, NotificationChain msgs) {
@@ -369,8 +363,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -392,8 +386,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -402,8 +396,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetPost(Expression newPost, NotificationChain msgs) {
@@ -421,8 +415,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -444,8 +438,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -454,8 +448,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -468,8 +462,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -478,8 +472,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -492,8 +486,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -502,8 +496,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBody(Block newBody, NotificationChain msgs) {
@@ -521,8 +515,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -544,8 +538,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -561,8 +555,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -583,8 +577,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -615,8 +609,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -656,8 +650,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -695,8 +689,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -725,8 +719,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -753,8 +747,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -781,8 +775,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -803,4 +797,4 @@
 		return result.toString();
 	}
 
-} //TemplateImpl
+} // TemplateImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/TextStatementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/TextStatementImpl.java
index 82dec9f..68fdad3 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/TextStatementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/TextStatementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -13,31 +13,27 @@
 
 import org.eclipse.acceleo.AcceleoPackage;
 import org.eclipse.acceleo.TextStatement;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Text Statement</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Text Statement</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.TextStatementImpl#getValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.TextStatementImpl#getValue <em>Value</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class TextStatementImpl extends LeafStatementImpl implements TextStatement {
 	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -45,9 +41,9 @@
 	protected static final String VALUE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -55,8 +51,8 @@
 	protected String value = VALUE_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TextStatementImpl() {
@@ -64,8 +60,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,8 +70,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -84,8 +80,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -98,8 +94,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -112,8 +108,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,8 +123,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -142,8 +138,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -156,8 +152,8 @@
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -172,4 +168,4 @@
 		return result.toString();
 	}
 
-} //TextStatementImpl
+} // TextStatementImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/TypedElementImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/TypedElementImpl.java
index 457c532..50bff61 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/TypedElementImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/TypedElementImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -29,17 +29,17 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.acceleo.impl.TypedElementImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.acceleo.impl.TypedElementImpl#getTypeAql <em>Type Aql</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.TypedElementImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.acceleo.impl.TypedElementImpl#getTypeAql <em>Type Aql</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class TypedElementImpl extends MinimalEObjectImpl.Container implements TypedElement {
 	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -47,9 +47,9 @@
 	protected static final AstResult TYPE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -68,6 +68,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TypedElementImpl() {
@@ -76,6 +77,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -85,6 +87,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -94,6 +97,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -107,6 +111,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -116,6 +121,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTypeAql(Expression newTypeAql, NotificationChain msgs) {
@@ -134,6 +140,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -156,6 +163,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -169,6 +177,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -184,6 +193,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -201,6 +211,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -218,6 +229,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -233,6 +245,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/VariableImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/VariableImpl.java
index 8cca1d0..58693a2 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/VariableImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/impl/VariableImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -33,9 +33,9 @@
  */
 public class VariableImpl extends TypedElementImpl implements Variable {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -43,9 +43,9 @@
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -54,6 +54,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected VariableImpl() {
@@ -62,6 +63,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -71,6 +73,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -80,6 +83,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -93,6 +97,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -106,6 +111,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -120,6 +126,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -134,6 +141,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -147,6 +155,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -170,6 +179,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -193,6 +203,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoAdapterFactory.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoAdapterFactory.java
index 84261f6..edb7665 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoAdapterFactory.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoAdapterFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -62,35 +62,29 @@
 import org.eclipse.acceleo.TextStatement;
 import org.eclipse.acceleo.TypedElement;
 import org.eclipse.acceleo.Variable;
-
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter
+ * <code>createXXX</code> method for each class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.acceleo.AcceleoPackage
  * @generated
  */
 public class AcceleoAdapterFactory extends AdapterFactoryImpl {
 	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static AcceleoPackage modelPackage;
 
 	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AcceleoAdapterFactory() {
@@ -100,10 +94,10 @@
 	}
 
 	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
+	 * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This
+	 * implementation returns <code>true</code> if the object is either the model's package or is an instance
+	 * object of the model. <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
@@ -119,9 +113,9 @@
 	}
 
 	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected AcceleoSwitch<Adapter> modelSwitch = new AcceleoSwitch<Adapter>() {
@@ -392,10 +386,10 @@
 	};
 
 	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param target
+	 *            the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -405,11 +399,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Module <em>Module</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Module <em>Module</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.acceleo.Module
 	 * @generated
@@ -419,11 +412,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorModule <em>Error Module</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorModule <em>Error
+	 * Module</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.acceleo.ErrorModule
 	 * @generated
@@ -433,11 +426,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Metamodel <em>Metamodel</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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Metamodel
+	 * <em>Metamodel</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.acceleo.Metamodel
 	 * @generated
@@ -447,11 +440,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorMetamodel <em>Error Metamodel</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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorMetamodel <em>Error
+	 * Metamodel</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.acceleo.ErrorMetamodel
 	 * @generated
@@ -461,11 +454,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Import <em>Import</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Import <em>Import</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.acceleo.Import
 	 * @generated
@@ -475,11 +467,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorImport <em>Error Import</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorImport <em>Error
+	 * Import</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.acceleo.ErrorImport
 	 * @generated
@@ -489,11 +481,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ModuleReference <em>Module Reference</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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ModuleReference <em>Module
+	 * Reference</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.acceleo.ModuleReference
 	 * @generated
@@ -503,11 +495,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorModuleReference <em>Error Module Reference</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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorModuleReference <em>Error
+	 * Module Reference</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.acceleo.ErrorModuleReference
 	 * @generated
@@ -517,11 +509,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ModuleElement <em>Module Element</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ModuleElement <em>Module
+	 * Element</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.acceleo.ModuleElement
 	 * @generated
@@ -532,10 +524,9 @@
 
 	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Comment <em>Comment</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 -->
+	 * <!-- 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.acceleo.Comment
 	 * @generated
@@ -545,11 +536,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.BlockComment <em>Block Comment</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.BlockComment <em>Block
+	 * Comment</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.acceleo.BlockComment
 	 * @generated
@@ -559,11 +550,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorBlockComment <em>Error Block Comment</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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorBlockComment <em>Error
+	 * Block Comment</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.acceleo.ErrorBlockComment
 	 * @generated
@@ -573,11 +564,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorComment <em>Error Comment</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorComment <em>Error
+	 * Comment</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.acceleo.ErrorComment
 	 * @generated
@@ -587,11 +578,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.CommentBody <em>Comment Body</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.CommentBody <em>Comment
+	 * Body</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.acceleo.CommentBody
 	 * @generated
@@ -601,11 +592,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Documentation <em>Documentation</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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Documentation
+	 * <em>Documentation</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.acceleo.Documentation
 	 * @generated
@@ -615,11 +606,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ModuleDocumentation <em>Module Documentation</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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ModuleDocumentation <em>Module
+	 * Documentation</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.acceleo.ModuleDocumentation
 	 * @generated
@@ -629,11 +620,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorModuleDocumentation <em>Error Module Documentation</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorModuleDocumentation
+	 * <em>Error Module Documentation</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.acceleo.ErrorModuleDocumentation
 	 * @generated
@@ -643,11 +634,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ModuleElementDocumentation <em>Module Element Documentation</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ModuleElementDocumentation
+	 * <em>Module Element Documentation</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.acceleo.ModuleElementDocumentation
 	 * @generated
@@ -657,11 +648,12 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorModuleElementDocumentation <em>Error Module Element Documentation</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.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.acceleo.ErrorModuleElementDocumentation <em>Error Module Element
+	 * Documentation</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.acceleo.ErrorModuleElementDocumentation
 	 * @generated
@@ -671,11 +663,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ParameterDocumentation <em>Parameter Documentation</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ParameterDocumentation
+	 * <em>Parameter Documentation</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.acceleo.ParameterDocumentation
 	 * @generated
@@ -685,11 +677,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.DocumentedElement <em>Documented Element</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.DocumentedElement
+	 * <em>Documented Element</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.acceleo.DocumentedElement
 	 * @generated
@@ -699,11 +691,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.NamedElement <em>Named Element</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.NamedElement <em>Named
+	 * Element</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.acceleo.NamedElement
 	 * @generated
@@ -714,10 +706,9 @@
 
 	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ASTNode <em>AST Node</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 -->
+	 * <!-- 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.acceleo.ASTNode
 	 * @generated
@@ -727,11 +718,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Error <em>Error</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Error <em>Error</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.acceleo.Error
 	 * @generated
@@ -741,11 +731,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Block <em>Block</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Block <em>Block</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.acceleo.Block
 	 * @generated
@@ -755,11 +744,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.TypedElement <em>Typed Element</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.TypedElement <em>Typed
+	 * Element</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.acceleo.TypedElement
 	 * @generated
@@ -770,10 +759,9 @@
 
 	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Template <em>Template</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 -->
+	 * <!-- 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.acceleo.Template
 	 * @generated
@@ -783,11 +771,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorTemplate <em>Error Template</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorTemplate <em>Error
+	 * Template</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.acceleo.ErrorTemplate
 	 * @generated
@@ -797,11 +785,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Query <em>Query</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Query <em>Query</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.acceleo.Query
 	 * @generated
@@ -811,11 +798,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorQuery <em>Error Query</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorQuery <em>Error
+	 * Query</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.acceleo.ErrorQuery
 	 * @generated
@@ -825,11 +812,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Expression <em>Expression</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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Expression
+	 * <em>Expression</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.acceleo.Expression
 	 * @generated
@@ -839,11 +826,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorExpression <em>Error Expression</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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorExpression <em>Error
+	 * Expression</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.acceleo.ErrorExpression
 	 * @generated
@@ -854,10 +841,9 @@
 
 	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Variable <em>Variable</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 -->
+	 * <!-- 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.acceleo.Variable
 	 * @generated
@@ -867,11 +853,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorVariable <em>Error Variable</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorVariable <em>Error
+	 * Variable</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.acceleo.ErrorVariable
 	 * @generated
@@ -882,10 +868,9 @@
 
 	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Binding <em>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 -->
+	 * <!-- 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.acceleo.Binding
 	 * @generated
@@ -895,11 +880,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorBinding <em>Error 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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorBinding <em>Error
+	 * 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.acceleo.ErrorBinding
 	 * @generated
@@ -909,11 +894,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Statement <em>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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.Statement
+	 * <em>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.acceleo.Statement
 	 * @generated
@@ -923,11 +908,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.LeafStatement <em>Leaf 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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.LeafStatement <em>Leaf
+	 * 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.acceleo.LeafStatement
 	 * @generated
@@ -937,11 +922,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ExpressionStatement <em>Expression 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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ExpressionStatement
+	 * <em>Expression 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.acceleo.ExpressionStatement
 	 * @generated
@@ -951,11 +936,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorExpressionStatement <em>Error Expression 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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorExpressionStatement
+	 * <em>Error Expression 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.acceleo.ErrorExpressionStatement
 	 * @generated
@@ -965,11 +950,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ProtectedArea <em>Protected Area</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ProtectedArea <em>Protected
+	 * Area</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.acceleo.ProtectedArea
 	 * @generated
@@ -979,11 +964,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorProtectedArea <em>Error Protected Area</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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorProtectedArea <em>Error
+	 * Protected Area</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.acceleo.ErrorProtectedArea
 	 * @generated
@@ -993,11 +978,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ForStatement <em>For 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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ForStatement <em>For
+	 * 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.acceleo.ForStatement
 	 * @generated
@@ -1007,11 +992,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorForStatement <em>Error For 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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorForStatement <em>Error
+	 * For 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.acceleo.ErrorForStatement
 	 * @generated
@@ -1021,11 +1006,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.IfStatement <em>If 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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.IfStatement <em>If
+	 * 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.acceleo.IfStatement
 	 * @generated
@@ -1035,11 +1020,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorIfStatement <em>Error If 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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorIfStatement <em>Error If
+	 * 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.acceleo.ErrorIfStatement
 	 * @generated
@@ -1049,11 +1034,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.LetStatement <em>Let 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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.LetStatement <em>Let
+	 * 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.acceleo.LetStatement
 	 * @generated
@@ -1063,11 +1048,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorLetStatement <em>Error Let 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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorLetStatement <em>Error
+	 * Let 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.acceleo.ErrorLetStatement
 	 * @generated
@@ -1077,11 +1062,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.FileStatement <em>File 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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.FileStatement <em>File
+	 * 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.acceleo.FileStatement
 	 * @generated
@@ -1091,11 +1076,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorFileStatement <em>Error File 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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.ErrorFileStatement <em>Error
+	 * File 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.acceleo.ErrorFileStatement
 	 * @generated
@@ -1105,11 +1090,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.TextStatement <em>Text 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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.TextStatement <em>Text
+	 * 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.acceleo.TextStatement
 	 * @generated
@@ -1119,11 +1104,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.NewLineStatement <em>New Line 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.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.NewLineStatement <em>New Line
+	 * 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.acceleo.NewLineStatement
 	 * @generated
@@ -1133,10 +1118,9 @@
 	}
 
 	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
+	 * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns
+	 * null. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
@@ -1144,4 +1128,4 @@
 		return null;
 	}
 
-} //AcceleoAdapterFactory
+} // AcceleoAdapterFactory
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoResourceFactoryImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoResourceFactoryImpl.java
index e29be7c..8ea20d2 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoResourceFactoryImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoResourceFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,23 +12,19 @@
 package org.eclipse.acceleo.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.acceleo.util.AcceleoResourceImpl
  * @generated
  */
 public class AcceleoResourceFactoryImpl extends ResourceFactoryImpl {
 	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the resource factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AcceleoResourceFactoryImpl() {
@@ -36,9 +32,8 @@
 	}
 
 	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the resource. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -47,4 +42,4 @@
 		return result;
 	}
 
-} //AcceleoResourceFactoryImpl
+} // AcceleoResourceFactoryImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoResourceImpl.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoResourceImpl.java
index 63d012c..7eefdfb 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoResourceImpl.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoResourceImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,26 +12,24 @@
 package org.eclipse.acceleo.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.acceleo.util.AcceleoResourceFactoryImpl
  * @generated
  */
 public class AcceleoResourceImpl extends XMLResourceImpl {
 	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * Creates an instance of the resource. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param uri
+	 *            the URI of the new resource.
 	 * @generated
 	 */
 	public AcceleoResourceImpl(URI uri) {
 		super(uri);
 	}
 
-} //AcceleoResourceImpl
+} // AcceleoResourceImpl
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoSwitch.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoSwitch.java
index 7a4735e..803f92a 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoSwitch.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoSwitch.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -62,38 +62,30 @@
 import org.eclipse.acceleo.TextStatement;
 import org.eclipse.acceleo.TypedElement;
 import org.eclipse.acceleo.Variable;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.util.Switch;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
+ * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the
+ * model, starting with the actual class of the object and proceeding up the inheritance hierarchy until a
+ * non-null result is returned, which is the result of the switch. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.acceleo.AcceleoPackage
  * @generated
  */
 public class AcceleoSwitch<T> extends Switch<T> {
 	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static AcceleoPackage modelPackage;
 
 	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AcceleoSwitch() {
@@ -103,10 +95,10 @@
 	}
 
 	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param ePackage the package in question.
+	 * Checks whether this is a switch for the given package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param ePackage
+	 *            the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
@@ -116,9 +108,9 @@
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields
+	 * that result. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
@@ -831,12 +823,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Module</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Module</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>Module</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -846,12 +838,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error Module</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error Module</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>Error Module</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -861,12 +853,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Metamodel</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Metamodel</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>Metamodel</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -876,12 +868,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error Metamodel</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error Metamodel</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>Error Metamodel</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -891,12 +883,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Import</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Import</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>Import</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -906,12 +898,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error Import</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error Import</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>Error Import</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -921,12 +913,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Module Reference</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Module Reference</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>Module Reference</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -936,12 +928,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error Module Reference</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error Module Reference</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>Error Module Reference</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -951,12 +943,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Module Element</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Module Element</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>Module Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -966,12 +958,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Comment</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Comment</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>Comment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -981,12 +973,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Block Comment</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Block Comment</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>Block Comment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -996,12 +988,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error Block Comment</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error Block Comment</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>Error Block Comment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1011,12 +1003,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error Comment</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error Comment</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>Error Comment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1026,12 +1018,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Comment Body</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Comment Body</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>Comment Body</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1041,12 +1033,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Documentation</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Documentation</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>Documentation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1056,12 +1048,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Module Documentation</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Module Documentation</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>Module Documentation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1072,11 +1064,11 @@
 
 	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Error Module Documentation</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.
+	 * <!-- 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>Error Module Documentation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1086,13 +1078,14 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Module Element Documentation</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>Module Element Documentation</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Module Element
+	 * Documentation</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>Module Element
+	 *         Documentation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1101,13 +1094,14 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error Module Element Documentation</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>Error Module Element Documentation</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Error Module Element
+	 * Documentation</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>Error Module Element
+	 *         Documentation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1117,11 +1111,11 @@
 
 	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Parameter Documentation</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.
+	 * <!-- 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>Parameter Documentation</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1131,12 +1125,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Documented Element</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Documented Element</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>Documented Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1146,12 +1140,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Named Element</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Named Element</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>Named Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1161,12 +1155,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>AST Node</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.
+	 * Returns the result of interpreting the object as an instance of '<em>AST Node</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>AST Node</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1176,12 +1170,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error</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>Error</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1191,12 +1185,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Block</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Block</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>Block</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1206,12 +1200,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Typed Element</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Typed Element</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>Typed Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1221,12 +1215,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Template</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Template</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>Template</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1236,12 +1230,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error Template</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error Template</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>Error Template</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1251,12 +1245,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Query</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Query</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>Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1266,12 +1260,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error Query</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error Query</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>Error Query</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1281,12 +1275,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Expression</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Expression</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>Expression</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1296,12 +1290,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error Expression</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error Expression</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>Error Expression</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1311,12 +1305,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Variable</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Variable</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>Variable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1326,12 +1320,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error Variable</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error Variable</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>Error Variable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1341,12 +1335,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>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.
+	 * Returns the result of interpreting the object as an instance of '<em>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>Binding</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1356,12 +1350,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error 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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error 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>Error Binding</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1371,12 +1365,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>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.
+	 * Returns the result of interpreting the object as an instance of '<em>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>Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1386,12 +1380,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Leaf 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.
+	 * Returns the result of interpreting the object as an instance of '<em>Leaf 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>Leaf Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1401,12 +1395,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Expression 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.
+	 * Returns the result of interpreting the object as an instance of '<em>Expression 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>Expression Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1417,11 +1411,11 @@
 
 	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Error Expression 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.
+	 * <!-- 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>Error Expression Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1431,12 +1425,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Protected Area</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Protected Area</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>Protected Area</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1446,12 +1440,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error Protected Area</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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error Protected Area</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>Error Protected Area</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1461,12 +1455,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>For 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.
+	 * Returns the result of interpreting the object as an instance of '<em>For 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>For Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1476,12 +1470,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error For 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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error For 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>Error For Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1491,12 +1485,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>If 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.
+	 * Returns the result of interpreting the object as an instance of '<em>If 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>If Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1506,12 +1500,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error If 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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error If 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>Error If Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1521,12 +1515,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Let 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.
+	 * Returns the result of interpreting the object as an instance of '<em>Let 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>Let Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1536,12 +1530,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error Let 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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error Let 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>Error Let Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1551,12 +1545,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>File 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.
+	 * Returns the result of interpreting the object as an instance of '<em>File 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>File Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1566,12 +1560,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Error File 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.
+	 * Returns the result of interpreting the object as an instance of '<em>Error File 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>Error File Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1581,12 +1575,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Text 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.
+	 * Returns the result of interpreting the object as an instance of '<em>Text 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>Text Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1596,12 +1590,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>New Line 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.
+	 * Returns the result of interpreting the object as an instance of '<em>New Line 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>New Line Statement</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -1611,12 +1605,12 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc
+	 * --> This implementation returns null; returning a non-null result will terminate the switch, but this
+	 * is the last case anyway. <!-- end-user-doc -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -1626,4 +1620,4 @@
 		return null;
 	}
 
-} //AcceleoSwitch
+} // AcceleoSwitch
diff --git a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoXMLProcessor.java b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoXMLProcessor.java
index 06fc9d6..293edb1 100644
--- a/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoXMLProcessor.java
+++ b/plugins/org.eclipse.acceleo.aql/src-gen/org/eclipse/acceleo/util/AcceleoXMLProcessor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, 2020 Obeo.
+ * Copyright (c) 2008, 2021 Obeo.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -19,16 +19,16 @@
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
 
 /**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc --> <!--
+ * This class contains helper methods to serialize and deserialize XML documents <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class AcceleoXMLProcessor extends XMLProcessor {
 
 	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Public constructor to instantiate the helper. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public AcceleoXMLProcessor() {
@@ -37,9 +37,9 @@
 	}
 
 	/**
-	 * Register for "*" and "xml" file extensions the AcceleoResourceFactoryImpl factory.
-	 * <!-- begin-user-doc
+	 * Register for "*" and "xml" file extensions the AcceleoResourceFactoryImpl factory. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/AcceleoUtil.java b/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/AcceleoUtil.java
index 5777447..d1f60be 100644
--- a/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/AcceleoUtil.java
+++ b/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/AcceleoUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Obeo.
+ * Copyright (c) 2020, 2021 Obeo.
  * 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
@@ -11,6 +11,7 @@
 package org.eclipse.acceleo.aql;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -22,11 +23,12 @@
 import org.eclipse.acceleo.ModuleElement;
 import org.eclipse.acceleo.Template;
 import org.eclipse.acceleo.aql.evaluation.AcceleoEvaluator;
-import org.eclipse.acceleo.query.ast.TypeLiteral;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
 import org.eclipse.acceleo.query.runtime.IQueryEnvironment;
 import org.eclipse.acceleo.query.services.EObjectServices;
 import org.eclipse.acceleo.util.AcceleoSwitch;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -126,22 +128,28 @@
 		// TODO more than one EClass type ?
 		final String parameterName = main.getParameters().get(0).getName();
 		// TODO use IType ?
-		final EClass parameterType = (EClass)((TypeLiteral)main.getParameters().get(0).getType().getAst())
-				.getValue();
-		final List<EObject> values = new ArrayList<EObject>();
-		for (Resource model : resources) {
-			for (EObject root : model.getContents()) {
-				if (parameterType.isInstance(root)) {
-					values.add(root);
+		// TODO this is really quick and dirty
+		final EClassifierTypeLiteral eClassifierTypeLiteral = (EClassifierTypeLiteral)main.getParameters()
+				.get(0).getType().getAst();
+		final Collection<EClassifier> eClassifiers = queryEnvironment.getEPackageProvider().getTypes(
+				eClassifierTypeLiteral.getEPackageName(), eClassifierTypeLiteral.getEClassifierName());
+		if (!eClassifiers.isEmpty()) {
+			final EClass parameterType = (EClass)eClassifiers.iterator().next();
+			final List<EObject> values = new ArrayList<EObject>();
+			for (Resource model : resources) {
+				for (EObject root : model.getContents()) {
+					if (parameterType.isInstance(root)) {
+						values.add(root);
+					}
+					values.addAll(services.eAllContents(root, parameterType));
 				}
-				values.addAll(services.eAllContents(root, parameterType));
 			}
-		}
 
-		final Map<String, Object> variables = new HashMap<String, Object>();
-		for (EObject value : values) {
-			variables.put(parameterName, value);
-			evaluator.generate(module, variables);
+			final Map<String, Object> variables = new HashMap<String, Object>();
+			for (EObject value : values) {
+				variables.put(parameterName, value);
+				evaluator.generate(module, variables);
+			}
 		}
 	}
 
diff --git a/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/completion/AcceleoCompletor.java b/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/completion/AcceleoCompletor.java
index cd07192..7bd8884 100644
--- a/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/completion/AcceleoCompletor.java
+++ b/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/completion/AcceleoCompletor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2020 Obeo.
+ * Copyright (c) 2017, 2021 Obeo.
  * 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
@@ -62,7 +62,7 @@
 				+ moduleFileName;
 
 		// First, parse the source contents up to the position.
-		final AcceleoParser acceleoParser = new AcceleoParser(acceleoEnvironment.getQueryEnvironment());
+		final AcceleoParser acceleoParser = new AcceleoParser();
 		final String partialAcceleoSource = source.substring(0, position);
 		final AcceleoAstResult partialAcceleoAstResult = acceleoParser.parse(partialAcceleoSource,
 				moduleQualifiedNameForCompletion);
diff --git a/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/location/aql/AqlDefinitionLocator.java b/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/location/aql/AqlDefinitionLocator.java
index b6acecf..33e4b09 100644
--- a/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/location/aql/AqlDefinitionLocator.java
+++ b/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/location/aql/AqlDefinitionLocator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Obeo.
+ * Copyright (c) 2020, 2021 Obeo.
  * 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
@@ -11,6 +11,7 @@
 package org.eclipse.acceleo.aql.location.aql;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -20,11 +21,12 @@
 import org.eclipse.acceleo.aql.location.common.AbstractLocationLink;
 import org.eclipse.acceleo.aql.parser.AcceleoAstUtils;
 import org.eclipse.acceleo.query.ast.Call;
+import org.eclipse.acceleo.query.ast.ClassTypeLiteral;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
 import org.eclipse.acceleo.query.ast.EnumLiteral;
 import org.eclipse.acceleo.query.ast.Error;
 import org.eclipse.acceleo.query.ast.Expression;
 import org.eclipse.acceleo.query.ast.Literal;
-import org.eclipse.acceleo.query.ast.TypeLiteral;
 import org.eclipse.acceleo.query.ast.VariableDeclaration;
 import org.eclipse.acceleo.query.ast.util.AstSwitch;
 import org.eclipse.acceleo.query.parser.AstEvaluator;
@@ -39,6 +41,8 @@
 import org.eclipse.acceleo.query.runtime.impl.Nothing;
 import org.eclipse.acceleo.query.runtime.impl.ValidationServices;
 import org.eclipse.acceleo.query.validation.type.IType;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnumLiteral;
 
 /**
  * An {@link AstSwitch AQL Switch} to provide, for an element from an AQL AST, the {@link List} of
@@ -143,13 +147,28 @@
 	}
 
 	@Override
-	public List<AbstractLocationLink<?, ?>> caseTypeLiteral(TypeLiteral typeLiteral) {
-		return Collections.singletonList(new AqlLocationLinkToAny(typeLiteral, typeLiteral.getValue()));
+	public List<AbstractLocationLink<?, ?>> caseClassTypeLiteral(ClassTypeLiteral classTypeLiteral) {
+		return Collections.singletonList(new AqlLocationLinkToAny(classTypeLiteral, classTypeLiteral
+				.getValue()));
+	}
+
+	@Override
+	public List<AbstractLocationLink<?, ?>> caseEClassifierTypeLiteral(
+			EClassifierTypeLiteral eClassifierTypeLiteral) {
+		final Collection<EClassifier> eClassifiers = queryEnvironment.getEPackageProvider().getTypes(
+				eClassifierTypeLiteral.getEPackageName(), eClassifierTypeLiteral.getEClassifierName());
+
+		return eClassifiers.stream().map(eClassifier -> new AqlLocationLinkToAny(eClassifierTypeLiteral,
+				eClassifier)).collect(Collectors.toList());
 	}
 
 	@Override
 	public List<AbstractLocationLink<?, ?>> caseEnumLiteral(EnumLiteral enumLiteral) {
-		return Collections.singletonList(new AqlLocationLinkToAny(enumLiteral, enumLiteral.getLiteral()));
+		final Collection<EEnumLiteral> eEnumLiterals = queryEnvironment.getEPackageProvider().getEnumLiterals(
+				enumLiteral.getEPackageName(), enumLiteral.getEEnumName(), enumLiteral.getEEnumLiteralName());
+
+		return eEnumLiterals.stream().map(eEnumLiteral -> new AqlLocationLinkToAny(enumLiteral, eEnumLiteral))
+				.collect(Collectors.toList());
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/parser/AcceleoParser.java b/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/parser/AcceleoParser.java
index b3825e4..130f677 100644
--- a/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/parser/AcceleoParser.java
+++ b/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/parser/AcceleoParser.java
@@ -83,7 +83,6 @@
 import org.eclipse.acceleo.query.parser.Positions;
 import org.eclipse.acceleo.query.parser.QueryLexer;
 import org.eclipse.acceleo.query.parser.QueryParser;
-import org.eclipse.acceleo.query.runtime.IReadOnlyQueryEnvironment;
 import org.eclipse.emf.common.util.BasicDiagnostic;
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.URI;
@@ -396,11 +395,6 @@
 	public static final int INDENTATION = 2;
 
 	/**
-	 * The {@link IReadOnlyQueryEnvironment}.
-	 */
-	private final IReadOnlyQueryEnvironment queryEnvironment;
-
-	/**
 	 * The {@link Positions}.
 	 */
 	private Positions positions;
@@ -431,16 +425,6 @@
 	private List<Error> errors;
 
 	/**
-	 * Constructor.
-	 * 
-	 * @param queryEnvironment
-	 *            the {@link IReadOnlyQueryEnvironment}
-	 */
-	public AcceleoParser(IReadOnlyQueryEnvironment queryEnvironment) {
-		this.queryEnvironment = queryEnvironment;
-	}
-
-	/**
 	 * Parses the given {@link InputStream}.
 	 * 
 	 * @param source
@@ -2290,7 +2274,7 @@
 		final AstResult result;
 
 		if (expression != null && expression.length() > 0) {
-			AstBuilderListener astBuilder = new AstBuilderListener(queryEnvironment);
+			AstBuilderListener astBuilder = new AstBuilderListener();
 			CharStream input = new UnbufferedCharStream(new StringReader(expression), expression.length());
 			QueryLexer lexer = new QueryLexer(input);
 			lexer.setTokenFactory(new CommonTokenFactory(true));
@@ -2339,7 +2323,7 @@
 		final AstResult result;
 
 		if (expression != null && expression.length() > 0) {
-			AstBuilderListener astBuilder = new AstBuilderListener(queryEnvironment);
+			AstBuilderListener astBuilder = new AstBuilderListener();
 			CharStream input = new UnbufferedCharStream(new StringReader(expression), expression.length());
 			QueryLexer lexer = new QueryLexer(input);
 			lexer.setTokenFactory(new CommonTokenFactory(true));
diff --git a/query/plugins/org.eclipse.acceleo.query/model/ast.ecore b/query/plugins/org.eclipse.acceleo.query/model/ast.ecore
index 552fdea..0eb8709 100644
--- a/query/plugins/org.eclipse.acceleo.query/model/ast.ecore
+++ b/query/plugins/org.eclipse.acceleo.query/model/ast.ecore
@@ -30,17 +30,30 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EnumLiteral" eSuperTypes="#//Literal">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="literal" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EEnumLiteral"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ePackageName" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="eEnumName" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="eEnumLiteralName" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TypeLiteral" eSuperTypes="#//Literal">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="#//ObjectType"/>
+  <eClassifiers xsi:type="ecore:EClass" name="TypeLiteral" abstract="true" interface="true"
+      eSuperTypes="#//Literal"/>
+  <eClassifiers xsi:type="ecore:EClass" name="EClassifierTypeLiteral" eSuperTypes="#//TypeLiteral">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ePackageName" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="eClassifierName" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TypeSetLiteral" eSuperTypes="#//TypeLiteral">
+  <eClassifiers xsi:type="ecore:EClass" name="ClassTypeLiteral" eSuperTypes="#//TypeLiteral">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="#//JavaClass"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="TypeSetLiteral" eSuperTypes="#//ClassTypeLiteral">
     <eStructuralFeatures xsi:type="ecore:EReference" name="types" lowerBound="1" upperBound="-1"
         eType="#//TypeLiteral" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ObjectType" instanceClassName="java.lang.Object"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CollectionTypeLiteral" eSuperTypes="#//TypeLiteral">
+  <eClassifiers xsi:type="ecore:EDataType" name="JavaClass" instanceClassName="java.lang.Class"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CollectionTypeLiteral" eSuperTypes="#//ClassTypeLiteral">
     <eStructuralFeatures xsi:type="ecore:EReference" name="elementType" lowerBound="1"
         eType="#//TypeLiteral" containment="true"/>
   </eClassifiers>
@@ -69,16 +82,12 @@
   <eClassifiers xsi:type="ecore:EClass" name="Error" abstract="true" interface="true"
       eSuperTypes="#//Expression"/>
   <eClassifiers xsi:type="ecore:EClass" name="ErrorExpression" eSuperTypes="#//Error"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ErrorTypeLiteral" eSuperTypes="#//Error #//TypeLiteral">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="segments" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ErrorTypeLiteral" eSuperTypes="#//Error #//TypeLiteral"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ErrorEClassifierTypeLiteral" eSuperTypes="#//Error #//EClassifierTypeLiteral">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="missingColon" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ErrorEClassifierTypeLiteral" eSuperTypes="#//ErrorTypeLiteral"/>
   <eClassifiers xsi:type="ecore:EClass" name="ErrorEnumLiteral" eSuperTypes="#//Error #//EnumLiteral">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="segments" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="missingColon" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
@@ -91,7 +100,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="ErrorStringLiteral" eSuperTypes="#//Error #//StringLiteral"/>
   <eClassifiers xsi:type="ecore:EClass" name="ErrorConditional" eSuperTypes="#//Error #//Conditional"/>
   <eClassifiers xsi:type="ecore:EClass" name="Binding">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//TypeLiteral"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//Expression"
diff --git a/query/plugins/org.eclipse.acceleo.query/model/ast.genmodel b/query/plugins/org.eclipse.acceleo.query/model/ast.genmodel
index 9474514..d5c2313 100644
--- a/query/plugins/org.eclipse.acceleo.query/model/ast.genmodel
+++ b/query/plugins/org.eclipse.acceleo.query/model/ast.genmodel
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2015 Obeo.&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License v1.0&#xA; which accompanies this distribution, and is available at&#xA; http://www.eclipse.org/legal/epl-v10.html&#xA; &#xA; Contributors:&#xA;     Obeo - initial API and implementation&#xA;"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2015, 2021 Obeo.&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License v1.0&#xA; which accompanies this distribution, and is available at&#xA; http://www.eclipse.org/legal/epl-v10.html&#xA; &#xA; Contributors:&#xA;     Obeo - initial API and implementation&#xA;"
     modelDirectory="/org.eclipse.acceleo.query/src-gen" editDirectory="/org.eclipse.acceleo.query.edit/src-gen"
     editorDirectory="/org.eclipse.acceleo.query.editor/src-gen" modelPluginID="org.eclipse.acceleo.query"
     templateDirectory="" modelName="Ast" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     testsDirectory="/org.eclipse.acceleo.query.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="6.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
-    operationReflection="true" importOrganizing="true">
+    complianceLevel="6.0" copyrightFields="false" operationReflection="true" importOrganizing="true">
   <foreignModel>ast.ecore</foreignModel>
   <genPackages prefix="Ast" basePackage="org.eclipse.acceleo.query" disposableProviderFactory="true"
       ecorePackage="ast.ecore#/">
@@ -15,7 +14,7 @@
       <genEnumLiterals ecoreEnumLiteral="ast.ecore#//CallType/CALLORAPPLY"/>
       <genEnumLiterals ecoreEnumLiteral="ast.ecore#//CallType/COLLECTIONCALL"/>
     </genEnums>
-    <genDataTypes ecoreDataType="ast.ecore#//ObjectType"/>
+    <genDataTypes ecoreDataType="ast.ecore#//JavaClass"/>
     <genClasses image="false" ecoreClass="ast.ecore#//Expression"/>
     <genClasses ecoreClass="ast.ecore#//VarRef">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//VarRef/variableName"/>
@@ -39,10 +38,17 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//BooleanLiteral/value"/>
     </genClasses>
     <genClasses ecoreClass="ast.ecore#//EnumLiteral">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ast.ecore#//EnumLiteral/literal"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//EnumLiteral/ePackageName"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//EnumLiteral/eEnumName"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//EnumLiteral/eEnumLiteralName"/>
     </genClasses>
-    <genClasses ecoreClass="ast.ecore#//TypeLiteral">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//TypeLiteral/value"/>
+    <genClasses ecoreClass="ast.ecore#//TypeLiteral"/>
+    <genClasses ecoreClass="ast.ecore#//EClassifierTypeLiteral">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//EClassifierTypeLiteral/ePackageName"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//EClassifierTypeLiteral/eClassifierName"/>
+    </genClasses>
+    <genClasses ecoreClass="ast.ecore#//ClassTypeLiteral">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//ClassTypeLiteral/value"/>
     </genClasses>
     <genClasses ecoreClass="ast.ecore#//TypeSetLiteral">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ast.ecore#//TypeSetLiteral/types"/>
@@ -68,13 +74,11 @@
     </genClasses>
     <genClasses image="false" ecoreClass="ast.ecore#//Error"/>
     <genClasses ecoreClass="ast.ecore#//ErrorExpression"/>
-    <genClasses ecoreClass="ast.ecore#//ErrorTypeLiteral">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//ErrorTypeLiteral/segments"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//ErrorTypeLiteral/missingColon"/>
+    <genClasses ecoreClass="ast.ecore#//ErrorTypeLiteral"/>
+    <genClasses ecoreClass="ast.ecore#//ErrorEClassifierTypeLiteral">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//ErrorEClassifierTypeLiteral/missingColon"/>
     </genClasses>
-    <genClasses ecoreClass="ast.ecore#//ErrorEClassifierTypeLiteral"/>
     <genClasses ecoreClass="ast.ecore#//ErrorEnumLiteral">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//ErrorEnumLiteral/segments"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//ErrorEnumLiteral/missingColon"/>
     </genClasses>
     <genClasses ecoreClass="ast.ecore#//ErrorCall">
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/And.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/And.java
index 27f8a97..591c942 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/And.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/And.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/AstFactory.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/AstFactory.java
index f09d4e8..6eb4567 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/AstFactory.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/AstFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -92,12 +92,22 @@
 	EnumLiteral createEnumLiteral();
 
 	/**
-	 * Returns a new object of class '<em>Type Literal</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns a new object of class '<em>EClassifier Type Literal</em>'. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
 	 * 
-	 * @return a new object of class '<em>Type Literal</em>'.
+	 * @return a new object of class '<em>EClassifier Type Literal</em>'.
 	 * @generated
 	 */
-	TypeLiteral createTypeLiteral();
+	EClassifierTypeLiteral createEClassifierTypeLiteral();
+
+	/**
+	 * Returns a new object of class '<em>Class Type Literal</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
+	 * @return a new object of class '<em>Class Type Literal</em>'.
+	 * @generated
+	 */
+	ClassTypeLiteral createClassTypeLiteral();
 
 	/**
 	 * Returns a new object of class '<em>Type Set Literal</em>'. <!-- begin-user-doc --> <!-- end-user-doc
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/AstPackage.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/AstPackage.java
index b87d178..e5c31fc 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/AstPackage.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/AstPackage.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -362,13 +362,31 @@
 	int ENUM_LITERAL = 8;
 
 	/**
-	 * The feature id for the '<em><b>Literal</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
+	 * The feature id for the '<em><b>EPackage Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
 	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int ENUM_LITERAL__LITERAL = LITERAL_FEATURE_COUNT + 0;
+	int ENUM_LITERAL__EPACKAGE_NAME = LITERAL_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EEnum Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int ENUM_LITERAL__EENUM_NAME = LITERAL_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EEnum Literal Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int ENUM_LITERAL__EENUM_LITERAL_NAME = LITERAL_FEATURE_COUNT + 2;
 
 	/**
 	 * The number of structural features of the '<em>Enum Literal</em>' class. <!-- begin-user-doc --> <!--
@@ -377,7 +395,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ENUM_LITERAL_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 1;
+	int ENUM_LITERAL_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of operations of the '<em>Enum Literal</em>' class. <!-- begin-user-doc --> <!--
@@ -389,31 +407,23 @@
 	int ENUM_LITERAL_OPERATION_COUNT = LITERAL_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.query.ast.impl.TypeLiteralImpl <em>Type
-	 * Literal</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.query.ast.TypeLiteral <em>Type Literal</em>}'
+	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see org.eclipse.acceleo.query.ast.impl.TypeLiteralImpl
+	 * @see org.eclipse.acceleo.query.ast.TypeLiteral
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getTypeLiteral()
 	 * @generated
 	 */
 	int TYPE_LITERAL = 9;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int TYPE_LITERAL__VALUE = LITERAL_FEATURE_COUNT + 0;
-
-	/**
 	 * The number of structural features of the '<em>Type Literal</em>' class. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int TYPE_LITERAL_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 1;
+	int TYPE_LITERAL_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 0;
 
 	/**
 	 * The number of operations of the '<em>Type Literal</em>' class. <!-- begin-user-doc --> <!--
@@ -425,14 +435,60 @@
 	int TYPE_LITERAL_OPERATION_COUNT = LITERAL_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.acceleo.query.ast.impl.TypeSetLiteralImpl <em>Type Set
-	 * Literal</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The meta object id for the '{@link org.eclipse.acceleo.query.ast.impl.EClassifierTypeLiteralImpl
+	 * <em>EClassifier Type Literal</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see org.eclipse.acceleo.query.ast.impl.TypeSetLiteralImpl
-	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getTypeSetLiteral()
+	 * @see org.eclipse.acceleo.query.ast.impl.EClassifierTypeLiteralImpl
+	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getEClassifierTypeLiteral()
 	 * @generated
 	 */
-	int TYPE_SET_LITERAL = 10;
+	int ECLASSIFIER_TYPE_LITERAL = 10;
+
+	/**
+	 * The feature id for the '<em><b>EPackage Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME = TYPE_LITERAL_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EClassifier Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME = TYPE_LITERAL_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>EClassifier Type Literal</em>' class. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int ECLASSIFIER_TYPE_LITERAL_FEATURE_COUNT = TYPE_LITERAL_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>EClassifier Type Literal</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int ECLASSIFIER_TYPE_LITERAL_OPERATION_COUNT = TYPE_LITERAL_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.acceleo.query.ast.impl.ClassTypeLiteralImpl <em>Class
+	 * Type Literal</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see org.eclipse.acceleo.query.ast.impl.ClassTypeLiteralImpl
+	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getClassTypeLiteral()
+	 * @generated
+	 */
+	int CLASS_TYPE_LITERAL = 11;
 
 	/**
 	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -440,7 +496,43 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TYPE_SET_LITERAL__VALUE = TYPE_LITERAL__VALUE;
+	int CLASS_TYPE_LITERAL__VALUE = TYPE_LITERAL_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Class Type Literal</em>' class. <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int CLASS_TYPE_LITERAL_FEATURE_COUNT = TYPE_LITERAL_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Class Type Literal</em>' class. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int CLASS_TYPE_LITERAL_OPERATION_COUNT = TYPE_LITERAL_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.acceleo.query.ast.impl.TypeSetLiteralImpl <em>Type Set
+	 * Literal</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see org.eclipse.acceleo.query.ast.impl.TypeSetLiteralImpl
+	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getTypeSetLiteral()
+	 * @generated
+	 */
+	int TYPE_SET_LITERAL = 12;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_SET_LITERAL__VALUE = CLASS_TYPE_LITERAL__VALUE;
 
 	/**
 	 * The feature id for the '<em><b>Types</b></em>' containment reference list. <!-- begin-user-doc --> <!--
@@ -449,7 +541,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TYPE_SET_LITERAL__TYPES = TYPE_LITERAL_FEATURE_COUNT + 0;
+	int TYPE_SET_LITERAL__TYPES = CLASS_TYPE_LITERAL_FEATURE_COUNT + 0;
 
 	/**
 	 * The number of structural features of the '<em>Type Set Literal</em>' class. <!-- begin-user-doc -->
@@ -458,7 +550,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TYPE_SET_LITERAL_FEATURE_COUNT = TYPE_LITERAL_FEATURE_COUNT + 1;
+	int TYPE_SET_LITERAL_FEATURE_COUNT = CLASS_TYPE_LITERAL_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of operations of the '<em>Type Set Literal</em>' class. <!-- begin-user-doc --> <!--
@@ -467,7 +559,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TYPE_SET_LITERAL_OPERATION_COUNT = TYPE_LITERAL_OPERATION_COUNT + 0;
+	int TYPE_SET_LITERAL_OPERATION_COUNT = CLASS_TYPE_LITERAL_OPERATION_COUNT + 0;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.acceleo.query.ast.impl.CollectionTypeLiteralImpl
@@ -477,7 +569,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getCollectionTypeLiteral()
 	 * @generated
 	 */
-	int COLLECTION_TYPE_LITERAL = 11;
+	int COLLECTION_TYPE_LITERAL = 13;
 
 	/**
 	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -485,7 +577,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLECTION_TYPE_LITERAL__VALUE = TYPE_LITERAL__VALUE;
+	int COLLECTION_TYPE_LITERAL__VALUE = CLASS_TYPE_LITERAL__VALUE;
 
 	/**
 	 * The feature id for the '<em><b>Element Type</b></em>' containment reference. <!-- begin-user-doc -->
@@ -494,7 +586,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLECTION_TYPE_LITERAL__ELEMENT_TYPE = TYPE_LITERAL_FEATURE_COUNT + 0;
+	int COLLECTION_TYPE_LITERAL__ELEMENT_TYPE = CLASS_TYPE_LITERAL_FEATURE_COUNT + 0;
 
 	/**
 	 * The number of structural features of the '<em>Collection Type Literal</em>' class. <!-- begin-user-doc
@@ -503,7 +595,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLECTION_TYPE_LITERAL_FEATURE_COUNT = TYPE_LITERAL_FEATURE_COUNT + 1;
+	int COLLECTION_TYPE_LITERAL_FEATURE_COUNT = CLASS_TYPE_LITERAL_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of operations of the '<em>Collection Type Literal</em>' class. <!-- begin-user-doc --> <!--
@@ -512,7 +604,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLECTION_TYPE_LITERAL_OPERATION_COUNT = TYPE_LITERAL_OPERATION_COUNT + 0;
+	int COLLECTION_TYPE_LITERAL_OPERATION_COUNT = CLASS_TYPE_LITERAL_OPERATION_COUNT + 0;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.acceleo.query.ast.impl.LambdaImpl <em>Lambda</em>}'
@@ -522,7 +614,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getLambda()
 	 * @generated
 	 */
-	int LAMBDA = 12;
+	int LAMBDA = 14;
 
 	/**
 	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list. <!-- begin-user-doc -->
@@ -567,7 +659,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getNullLiteral()
 	 * @generated
 	 */
-	int NULL_LITERAL = 13;
+	int NULL_LITERAL = 15;
 
 	/**
 	 * The number of structural features of the '<em>Null Literal</em>' class. <!-- begin-user-doc --> <!--
@@ -595,7 +687,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getSetInExtensionLiteral()
 	 * @generated
 	 */
-	int SET_IN_EXTENSION_LITERAL = 14;
+	int SET_IN_EXTENSION_LITERAL = 16;
 
 	/**
 	 * The feature id for the '<em><b>Values</b></em>' containment reference list. <!-- begin-user-doc -->
@@ -632,7 +724,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getSequenceInExtensionLiteral()
 	 * @generated
 	 */
-	int SEQUENCE_IN_EXTENSION_LITERAL = 15;
+	int SEQUENCE_IN_EXTENSION_LITERAL = 17;
 
 	/**
 	 * The feature id for the '<em><b>Values</b></em>' containment reference list. <!-- begin-user-doc -->
@@ -669,7 +761,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getVariableDeclaration()
 	 * @generated
 	 */
-	int VARIABLE_DECLARATION = 16;
+	int VARIABLE_DECLARATION = 18;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -723,7 +815,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getError()
 	 * @generated
 	 */
-	int ERROR = 17;
+	int ERROR = 19;
 
 	/**
 	 * The number of structural features of the '<em>Error</em>' class. <!-- begin-user-doc --> <!--
@@ -750,7 +842,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getErrorExpression()
 	 * @generated
 	 */
-	int ERROR_EXPRESSION = 18;
+	int ERROR_EXPRESSION = 20;
 
 	/**
 	 * The number of structural features of the '<em>Error Expression</em>' class. <!-- begin-user-doc -->
@@ -778,33 +870,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getErrorTypeLiteral()
 	 * @generated
 	 */
-	int ERROR_TYPE_LITERAL = 19;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int ERROR_TYPE_LITERAL__VALUE = ERROR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Segments</b></em>' attribute list. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int ERROR_TYPE_LITERAL__SEGMENTS = ERROR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Missing Colon</b></em>' attribute. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int ERROR_TYPE_LITERAL__MISSING_COLON = ERROR_FEATURE_COUNT + 2;
+	int ERROR_TYPE_LITERAL = 21;
 
 	/**
 	 * The number of structural features of the '<em>Error Type Literal</em>' class. <!-- begin-user-doc -->
@@ -813,7 +879,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ERROR_TYPE_LITERAL_FEATURE_COUNT = ERROR_FEATURE_COUNT + 3;
+	int ERROR_TYPE_LITERAL_FEATURE_COUNT = ERROR_FEATURE_COUNT + 0;
 
 	/**
 	 * The number of operations of the '<em>Error Type Literal</em>' class. <!-- begin-user-doc --> <!--
@@ -832,24 +898,25 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getErrorEClassifierTypeLiteral()
 	 * @generated
 	 */
-	int ERROR_ECLASSIFIER_TYPE_LITERAL = 20;
+	int ERROR_ECLASSIFIER_TYPE_LITERAL = 22;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int ERROR_ECLASSIFIER_TYPE_LITERAL__VALUE = ERROR_TYPE_LITERAL__VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Segments</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>EPackage Name</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int ERROR_ECLASSIFIER_TYPE_LITERAL__SEGMENTS = ERROR_TYPE_LITERAL__SEGMENTS;
+	int ERROR_ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME = ERROR_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EClassifier Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int ERROR_ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME = ERROR_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Missing Colon</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -858,7 +925,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ERROR_ECLASSIFIER_TYPE_LITERAL__MISSING_COLON = ERROR_TYPE_LITERAL__MISSING_COLON;
+	int ERROR_ECLASSIFIER_TYPE_LITERAL__MISSING_COLON = ERROR_FEATURE_COUNT + 2;
 
 	/**
 	 * The number of structural features of the '<em>Error EClassifier Type Literal</em>' class. <!--
@@ -867,7 +934,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ERROR_ECLASSIFIER_TYPE_LITERAL_FEATURE_COUNT = ERROR_TYPE_LITERAL_FEATURE_COUNT + 0;
+	int ERROR_ECLASSIFIER_TYPE_LITERAL_FEATURE_COUNT = ERROR_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of operations of the '<em>Error EClassifier Type Literal</em>' class. <!-- begin-user-doc
@@ -876,7 +943,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ERROR_ECLASSIFIER_TYPE_LITERAL_OPERATION_COUNT = ERROR_TYPE_LITERAL_OPERATION_COUNT + 0;
+	int ERROR_ECLASSIFIER_TYPE_LITERAL_OPERATION_COUNT = ERROR_OPERATION_COUNT + 0;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.acceleo.query.ast.impl.ErrorEnumLiteralImpl <em>Error
@@ -886,25 +953,34 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getErrorEnumLiteral()
 	 * @generated
 	 */
-	int ERROR_ENUM_LITERAL = 21;
+	int ERROR_ENUM_LITERAL = 23;
 
 	/**
-	 * The feature id for the '<em><b>Literal</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int ERROR_ENUM_LITERAL__LITERAL = ERROR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Segments</b></em>' attribute list. <!-- begin-user-doc --> <!--
+	 * The feature id for the '<em><b>EPackage Name</b></em>' attribute. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int ERROR_ENUM_LITERAL__SEGMENTS = ERROR_FEATURE_COUNT + 1;
+	int ERROR_ENUM_LITERAL__EPACKAGE_NAME = ERROR_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EEnum Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int ERROR_ENUM_LITERAL__EENUM_NAME = ERROR_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EEnum Literal Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int ERROR_ENUM_LITERAL__EENUM_LITERAL_NAME = ERROR_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Missing Colon</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -913,7 +989,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ERROR_ENUM_LITERAL__MISSING_COLON = ERROR_FEATURE_COUNT + 2;
+	int ERROR_ENUM_LITERAL__MISSING_COLON = ERROR_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of structural features of the '<em>Error Enum Literal</em>' class. <!-- begin-user-doc -->
@@ -922,7 +998,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ERROR_ENUM_LITERAL_FEATURE_COUNT = ERROR_FEATURE_COUNT + 3;
+	int ERROR_ENUM_LITERAL_FEATURE_COUNT = ERROR_FEATURE_COUNT + 4;
 
 	/**
 	 * The number of operations of the '<em>Error Enum Literal</em>' class. <!-- begin-user-doc --> <!--
@@ -941,7 +1017,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getErrorCall()
 	 * @generated
 	 */
-	int ERROR_CALL = 22;
+	int ERROR_CALL = 24;
 
 	/**
 	 * The feature id for the '<em><b>Service Name</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -1004,7 +1080,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getErrorVariableDeclaration()
 	 * @generated
 	 */
-	int ERROR_VARIABLE_DECLARATION = 23;
+	int ERROR_VARIABLE_DECLARATION = 25;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1058,7 +1134,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getErrorStringLiteral()
 	 * @generated
 	 */
-	int ERROR_STRING_LITERAL = 24;
+	int ERROR_STRING_LITERAL = 26;
 
 	/**
 	 * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1094,7 +1170,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getErrorConditional()
 	 * @generated
 	 */
-	int ERROR_CONDITIONAL = 25;
+	int ERROR_CONDITIONAL = 27;
 
 	/**
 	 * The feature id for the '<em><b>Predicate</b></em>' containment reference. <!-- begin-user-doc --> <!--
@@ -1149,7 +1225,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getBinding()
 	 * @generated
 	 */
-	int BINDING = 26;
+	int BINDING = 28;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1202,7 +1278,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getErrorBinding()
 	 * @generated
 	 */
-	int ERROR_BINDING = 27;
+	int ERROR_BINDING = 29;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1256,7 +1332,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getLet()
 	 * @generated
 	 */
-	int LET = 28;
+	int LET = 30;
 
 	/**
 	 * The feature id for the '<em><b>Bindings</b></em>' containment reference list. <!-- begin-user-doc -->
@@ -1301,7 +1377,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getConditional()
 	 * @generated
 	 */
-	int CONDITIONAL = 29;
+	int CONDITIONAL = 31;
 
 	/**
 	 * The feature id for the '<em><b>Predicate</b></em>' containment reference. <!-- begin-user-doc --> <!--
@@ -1356,7 +1432,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getOr()
 	 * @generated
 	 */
-	int OR = 30;
+	int OR = 32;
 
 	/**
 	 * The feature id for the '<em><b>Service Name</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -1409,7 +1485,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getAnd()
 	 * @generated
 	 */
-	int AND = 31;
+	int AND = 33;
 
 	/**
 	 * The feature id for the '<em><b>Service Name</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -1462,7 +1538,7 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getImplies()
 	 * @generated
 	 */
-	int IMPLIES = 32;
+	int IMPLIES = 34;
 
 	/**
 	 * The feature id for the '<em><b>Service Name</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -1515,21 +1591,21 @@
 	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getCallType()
 	 * @generated
 	 */
-	int CALL_TYPE = 33;
+	int CALL_TYPE = 35;
 
 	/**
-	 * The meta object id for the '<em>Object Type</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
+	 * The meta object id for the '<em>Java Class</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
-	 * @see java.lang.Object
-	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getObjectType()
+	 * @see java.lang.Class
+	 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getJavaClass()
 	 * @generated
 	 */
-	int OBJECT_TYPE = 34;
+	int JAVA_CLASS = 36;
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.query.ast.Expression <em>Expression</em>}
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.query.ast.Expression
+	 * <em>Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Expression</em>'.
 	 * @see org.eclipse.acceleo.query.ast.Expression
@@ -1591,8 +1667,8 @@
 	EAttribute getCall_Type();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.acceleo.query.ast.Call#getArguments <em>Arguments</em>}'. <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.acceleo.query.ast.Call#getArguments <em>Arguments</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference list '<em>Arguments</em>'.
@@ -1623,9 +1699,8 @@
 	EClass getIntegerLiteral();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.acceleo.query.ast.IntegerLiteral#getValue <em>Value</em>}'. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.query.ast.IntegerLiteral#getValue
+	 * <em>Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.acceleo.query.ast.IntegerLiteral#getValue()
@@ -1708,15 +1783,40 @@
 	EClass getEnumLiteral();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.acceleo.query.ast.EnumLiteral#getLiteral
-	 * <em>Literal</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.query.ast.EnumLiteral#getEPackageName <em>EPackage Name</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @return the meta object for the reference '<em>Literal</em>'.
-	 * @see org.eclipse.acceleo.query.ast.EnumLiteral#getLiteral()
+	 * @return the meta object for the attribute '<em>EPackage Name</em>'.
+	 * @see org.eclipse.acceleo.query.ast.EnumLiteral#getEPackageName()
 	 * @see #getEnumLiteral()
 	 * @generated
 	 */
-	EReference getEnumLiteral_Literal();
+	EAttribute getEnumLiteral_EPackageName();
+
+	/**
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.query.ast.EnumLiteral#getEEnumName <em>EEnum Name</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>EEnum Name</em>'.
+	 * @see org.eclipse.acceleo.query.ast.EnumLiteral#getEEnumName()
+	 * @see #getEnumLiteral()
+	 * @generated
+	 */
+	EAttribute getEnumLiteral_EEnumName();
+
+	/**
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.query.ast.EnumLiteral#getEEnumLiteralName <em>EEnum Literal Name</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>EEnum Literal Name</em>'.
+	 * @see org.eclipse.acceleo.query.ast.EnumLiteral#getEEnumLiteralName()
+	 * @see #getEnumLiteral()
+	 * @generated
+	 */
+	EAttribute getEnumLiteral_EEnumLiteralName();
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.query.ast.TypeLiteral <em>Type
@@ -1729,15 +1829,60 @@
 	EClass getTypeLiteral();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.acceleo.query.ast.TypeLiteral#getValue
-	 * <em>Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.query.ast.EClassifierTypeLiteral
+	 * <em>EClassifier Type Literal</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.acceleo.query.ast.TypeLiteral#getValue()
-	 * @see #getTypeLiteral()
+	 * @return the meta object for class '<em>EClassifier Type Literal</em>'.
+	 * @see org.eclipse.acceleo.query.ast.EClassifierTypeLiteral
 	 * @generated
 	 */
-	EAttribute getTypeLiteral_Value();
+	EClass getEClassifierTypeLiteral();
+
+	/**
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.query.ast.EClassifierTypeLiteral#getEPackageName <em>EPackage Name</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>EPackage Name</em>'.
+	 * @see org.eclipse.acceleo.query.ast.EClassifierTypeLiteral#getEPackageName()
+	 * @see #getEClassifierTypeLiteral()
+	 * @generated
+	 */
+	EAttribute getEClassifierTypeLiteral_EPackageName();
+
+	/**
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.query.ast.EClassifierTypeLiteral#getEClassifierName <em>EClassifier
+	 * Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>EClassifier Name</em>'.
+	 * @see org.eclipse.acceleo.query.ast.EClassifierTypeLiteral#getEClassifierName()
+	 * @see #getEClassifierTypeLiteral()
+	 * @generated
+	 */
+	EAttribute getEClassifierTypeLiteral_EClassifierName();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.query.ast.ClassTypeLiteral <em>Class Type
+	 * Literal</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for class '<em>Class Type Literal</em>'.
+	 * @see org.eclipse.acceleo.query.ast.ClassTypeLiteral
+	 * @generated
+	 */
+	EClass getClassTypeLiteral();
+
+	/**
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.query.ast.ClassTypeLiteral#getValue <em>Value</em>}'. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Value</em>'.
+	 * @see org.eclipse.acceleo.query.ast.ClassTypeLiteral#getValue()
+	 * @see #getClassTypeLiteral()
+	 * @generated
+	 */
+	EAttribute getClassTypeLiteral_Value();
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.query.ast.TypeSetLiteral <em>Type Set
@@ -1750,8 +1895,8 @@
 	EClass getTypeSetLiteral();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.acceleo.query.ast.TypeSetLiteral#getTypes <em>Types</em>}'. <!-- begin-user-doc -->
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.acceleo.query.ast.TypeSetLiteral#getTypes <em>Types</em>}'. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference list '<em>Types</em>'.
@@ -1794,8 +1939,8 @@
 	EClass getLambda();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.acceleo.query.ast.Lambda#getParameters <em>Parameters</em>}'. <!-- begin-user-doc
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.acceleo.query.ast.Lambda#getParameters <em>Parameters</em>}'. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference list '<em>Parameters</em>'.
@@ -1806,8 +1951,8 @@
 	EReference getLambda_Parameters();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.acceleo.query.ast.Lambda#getExpression <em>Expression</em>}'. <!-- begin-user-doc
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.acceleo.query.ast.Lambda#getExpression <em>Expression</em>}'. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Expression</em>'.
@@ -1882,8 +2027,8 @@
 	EClass getVariableDeclaration();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.acceleo.query.ast.VariableDeclaration#getName <em>Name</em>}'. <!-- begin-user-doc
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.query.ast.VariableDeclaration#getName <em>Name</em>}'. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
@@ -1894,8 +2039,8 @@
 	EAttribute getVariableDeclaration_Name();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.acceleo.query.ast.VariableDeclaration#getType <em>Type</em>}'. <!-- begin-user-doc
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.acceleo.query.ast.VariableDeclaration#getType <em>Type</em>}'. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Type</em>'.
@@ -1948,30 +2093,6 @@
 	EClass getErrorTypeLiteral();
 
 	/**
-	 * Returns the meta object for the attribute list '
-	 * {@link org.eclipse.acceleo.query.ast.ErrorTypeLiteral#getSegments <em>Segments</em>}'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute list '<em>Segments</em>'.
-	 * @see org.eclipse.acceleo.query.ast.ErrorTypeLiteral#getSegments()
-	 * @see #getErrorTypeLiteral()
-	 * @generated
-	 */
-	EAttribute getErrorTypeLiteral_Segments();
-
-	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.acceleo.query.ast.ErrorTypeLiteral#isMissingColon <em>Missing Colon</em>}'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '<em>Missing Colon</em>'.
-	 * @see org.eclipse.acceleo.query.ast.ErrorTypeLiteral#isMissingColon()
-	 * @see #getErrorTypeLiteral()
-	 * @generated
-	 */
-	EAttribute getErrorTypeLiteral_MissingColon();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.query.ast.ErrorEClassifierTypeLiteral
 	 * <em>Error EClassifier Type Literal</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -1982,6 +2103,18 @@
 	EClass getErrorEClassifierTypeLiteral();
 
 	/**
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.query.ast.ErrorEClassifierTypeLiteral#isMissingColon <em>Missing
+	 * Colon</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Missing Colon</em>'.
+	 * @see org.eclipse.acceleo.query.ast.ErrorEClassifierTypeLiteral#isMissingColon()
+	 * @see #getErrorEClassifierTypeLiteral()
+	 * @generated
+	 */
+	EAttribute getErrorEClassifierTypeLiteral_MissingColon();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.acceleo.query.ast.ErrorEnumLiteral <em>Error Enum
 	 * Literal</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -1992,18 +2125,6 @@
 	EClass getErrorEnumLiteral();
 
 	/**
-	 * Returns the meta object for the attribute list '
-	 * {@link org.eclipse.acceleo.query.ast.ErrorEnumLiteral#getSegments <em>Segments</em>}'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute list '<em>Segments</em>'.
-	 * @see org.eclipse.acceleo.query.ast.ErrorEnumLiteral#getSegments()
-	 * @see #getErrorEnumLiteral()
-	 * @generated
-	 */
-	EAttribute getErrorEnumLiteral_Segments();
-
-	/**
 	 * Returns the meta object for the attribute '
 	 * {@link org.eclipse.acceleo.query.ast.ErrorEnumLiteral#isMissingColon <em>Missing Colon</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -2016,8 +2137,8 @@
 	EAttribute getErrorEnumLiteral_MissingColon();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.acceleo.query.ast.ErrorCall <em>Error Call</em>}
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Returns the meta object for class '{@link org.eclipse.acceleo.query.ast.ErrorCall <em>Error
+	 * Call</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Error Call</em>'.
 	 * @see org.eclipse.acceleo.query.ast.ErrorCall
@@ -2026,8 +2147,8 @@
 	EClass getErrorCall();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.acceleo.query.ast.ErrorCall#isMissingEndParenthesis <em>Missing End
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.acceleo.query.ast.ErrorCall#isMissingEndParenthesis <em>Missing End
 	 * Parenthesis</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Missing End Parenthesis</em>'.
@@ -2089,8 +2210,8 @@
 	EAttribute getBinding_Name();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.acceleo.query.ast.Binding#getType <em>Type</em>}'. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.acceleo.query.ast.Binding#getType <em>Type</em>}'. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Type</em>'.
@@ -2101,8 +2222,8 @@
 	EReference getBinding_Type();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.acceleo.query.ast.Binding#getValue <em>Value</em>}'. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.acceleo.query.ast.Binding#getValue <em>Value</em>}'. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Value</em>'.
@@ -2133,8 +2254,8 @@
 	EClass getLet();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.acceleo.query.ast.Let#getBindings <em>Bindings</em>}'. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.acceleo.query.ast.Let#getBindings <em>Bindings</em>}'. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference list '<em>Bindings</em>'.
@@ -2145,9 +2266,8 @@
 	EReference getLet_Bindings();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.acceleo.query.ast.Let#getBody <em>Body</em>}'. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
+	 * Returns the meta object for the containment reference '{@link org.eclipse.acceleo.query.ast.Let#getBody
+	 * <em>Body</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Body</em>'.
 	 * @see org.eclipse.acceleo.query.ast.Let#getBody()
@@ -2167,9 +2287,9 @@
 	EClass getConditional();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.acceleo.query.ast.Conditional#getPredicate <em>Predicate</em>}'. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.acceleo.query.ast.Conditional#getPredicate <em>Predicate</em>}'. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Predicate</em>'.
 	 * @see org.eclipse.acceleo.query.ast.Conditional#getPredicate()
@@ -2243,15 +2363,15 @@
 	EEnum getCallType();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.Object <em>Object Type</em>}'. <!--
+	 * Returns the meta object for data type '{@link java.lang.Class <em>Java Class</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @return the meta object for data type '<em>Object Type</em>'.
-	 * @see java.lang.Object
-	 * @model instanceClass="java.lang.Object"
+	 * @return the meta object for data type '<em>Java Class</em>'.
+	 * @see java.lang.Class
+	 * @model instanceClass="java.lang.Class"
 	 * @generated
 	 */
-	EDataType getObjectType();
+	EDataType getJavaClass();
 
 	/**
 	 * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc
@@ -2431,30 +2551,85 @@
 		EClass ENUM_LITERAL = eINSTANCE.getEnumLiteral();
 
 		/**
-		 * The meta object literal for the '<em><b>Literal</b></em>' reference feature. <!-- begin-user-doc
+		 * The meta object literal for the '<em><b>EPackage Name</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute ENUM_LITERAL__EPACKAGE_NAME = eINSTANCE.getEnumLiteral_EPackageName();
+
+		/**
+		 * The meta object literal for the '<em><b>EEnum Name</b></em>' attribute feature. <!-- begin-user-doc
 		 * --> <!-- end-user-doc -->
 		 * 
 		 * @generated
 		 */
-		EReference ENUM_LITERAL__LITERAL = eINSTANCE.getEnumLiteral_Literal();
+		EAttribute ENUM_LITERAL__EENUM_NAME = eINSTANCE.getEnumLiteral_EEnumName();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.acceleo.query.ast.impl.TypeLiteralImpl <em>Type
+		 * The meta object literal for the '<em><b>EEnum Literal Name</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute ENUM_LITERAL__EENUM_LITERAL_NAME = eINSTANCE.getEnumLiteral_EEnumLiteralName();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.acceleo.query.ast.TypeLiteral <em>Type
 		 * Literal</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * 
-		 * @see org.eclipse.acceleo.query.ast.impl.TypeLiteralImpl
+		 * @see org.eclipse.acceleo.query.ast.TypeLiteral
 		 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getTypeLiteral()
 		 * @generated
 		 */
 		EClass TYPE_LITERAL = eINSTANCE.getTypeLiteral();
 
 		/**
+		 * The meta object literal for the
+		 * '{@link org.eclipse.acceleo.query.ast.impl.EClassifierTypeLiteralImpl <em>EClassifier Type
+		 * Literal</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
+		 * @see org.eclipse.acceleo.query.ast.impl.EClassifierTypeLiteralImpl
+		 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getEClassifierTypeLiteral()
+		 * @generated
+		 */
+		EClass ECLASSIFIER_TYPE_LITERAL = eINSTANCE.getEClassifierTypeLiteral();
+
+		/**
+		 * The meta object literal for the '<em><b>EPackage Name</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME = eINSTANCE
+				.getEClassifierTypeLiteral_EPackageName();
+
+		/**
+		 * The meta object literal for the '<em><b>EClassifier Name</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME = eINSTANCE
+				.getEClassifierTypeLiteral_EClassifierName();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.acceleo.query.ast.impl.ClassTypeLiteralImpl
+		 * <em>Class Type Literal</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
+		 * @see org.eclipse.acceleo.query.ast.impl.ClassTypeLiteralImpl
+		 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getClassTypeLiteral()
+		 * @generated
+		 */
+		EClass CLASS_TYPE_LITERAL = eINSTANCE.getClassTypeLiteral();
+
+		/**
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * 
 		 * @generated
 		 */
-		EAttribute TYPE_LITERAL__VALUE = eINSTANCE.getTypeLiteral_Value();
+		EAttribute CLASS_TYPE_LITERAL__VALUE = eINSTANCE.getClassTypeLiteral_Value();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.acceleo.query.ast.impl.TypeSetLiteralImpl
@@ -2475,8 +2650,8 @@
 		EReference TYPE_SET_LITERAL__TYPES = eINSTANCE.getTypeSetLiteral_Types();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.acceleo.query.ast.impl.CollectionTypeLiteralImpl <em>Collection Type
+		 * The meta object literal for the
+		 * '{@link org.eclipse.acceleo.query.ast.impl.CollectionTypeLiteralImpl <em>Collection Type
 		 * Literal</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @see org.eclipse.acceleo.query.ast.impl.CollectionTypeLiteralImpl
@@ -2530,8 +2705,8 @@
 		EClass NULL_LITERAL = eINSTANCE.getNullLiteral();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.acceleo.query.ast.impl.SetInExtensionLiteralImpl <em>Set In Extension
+		 * The meta object literal for the
+		 * '{@link org.eclipse.acceleo.query.ast.impl.SetInExtensionLiteralImpl <em>Set In Extension
 		 * Literal</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @see org.eclipse.acceleo.query.ast.impl.SetInExtensionLiteralImpl
@@ -2549,8 +2724,8 @@
 		EReference SET_IN_EXTENSION_LITERAL__VALUES = eINSTANCE.getSetInExtensionLiteral_Values();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.acceleo.query.ast.impl.SequenceInExtensionLiteralImpl <em>Sequence In Extension
+		 * The meta object literal for the
+		 * '{@link org.eclipse.acceleo.query.ast.impl.SequenceInExtensionLiteralImpl <em>Sequence In Extension
 		 * Literal</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @see org.eclipse.acceleo.query.ast.impl.SequenceInExtensionLiteralImpl
@@ -2632,24 +2807,8 @@
 		EClass ERROR_TYPE_LITERAL = eINSTANCE.getErrorTypeLiteral();
 
 		/**
-		 * The meta object literal for the '<em><b>Segments</b></em>' attribute list feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
-		 * 
-		 * @generated
-		 */
-		EAttribute ERROR_TYPE_LITERAL__SEGMENTS = eINSTANCE.getErrorTypeLiteral_Segments();
-
-		/**
-		 * The meta object literal for the '<em><b>Missing Colon</b></em>' attribute feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
-		 * 
-		 * @generated
-		 */
-		EAttribute ERROR_TYPE_LITERAL__MISSING_COLON = eINSTANCE.getErrorTypeLiteral_MissingColon();
-
-		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.acceleo.query.ast.impl.ErrorEClassifierTypeLiteralImpl <em>Error EClassifier
+		 * The meta object literal for the
+		 * '{@link org.eclipse.acceleo.query.ast.impl.ErrorEClassifierTypeLiteralImpl <em>Error EClassifier
 		 * Type Literal</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @see org.eclipse.acceleo.query.ast.impl.ErrorEClassifierTypeLiteralImpl
@@ -2659,6 +2818,15 @@
 		EClass ERROR_ECLASSIFIER_TYPE_LITERAL = eINSTANCE.getErrorEClassifierTypeLiteral();
 
 		/**
+		 * The meta object literal for the '<em><b>Missing Colon</b></em>' attribute feature. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute ERROR_ECLASSIFIER_TYPE_LITERAL__MISSING_COLON = eINSTANCE
+				.getErrorEClassifierTypeLiteral_MissingColon();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.acceleo.query.ast.impl.ErrorEnumLiteralImpl
 		 * <em>Error Enum Literal</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * 
@@ -2669,14 +2837,6 @@
 		EClass ERROR_ENUM_LITERAL = eINSTANCE.getErrorEnumLiteral();
 
 		/**
-		 * The meta object literal for the '<em><b>Segments</b></em>' attribute list feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
-		 * 
-		 * @generated
-		 */
-		EAttribute ERROR_ENUM_LITERAL__SEGMENTS = eINSTANCE.getErrorEnumLiteral_Segments();
-
-		/**
 		 * The meta object literal for the '<em><b>Missing Colon</b></em>' attribute feature. <!--
 		 * begin-user-doc --> <!-- end-user-doc -->
 		 * 
@@ -2703,8 +2863,8 @@
 		EAttribute ERROR_CALL__MISSING_END_PARENTHESIS = eINSTANCE.getErrorCall_MissingEndParenthesis();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.acceleo.query.ast.impl.ErrorVariableDeclarationImpl <em>Error Variable
+		 * The meta object literal for the
+		 * '{@link org.eclipse.acceleo.query.ast.impl.ErrorVariableDeclarationImpl <em>Error Variable
 		 * Declaration</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @see org.eclipse.acceleo.query.ast.impl.ErrorVariableDeclarationImpl
@@ -2878,14 +3038,14 @@
 		EEnum CALL_TYPE = eINSTANCE.getCallType();
 
 		/**
-		 * The meta object literal for the '<em>Object Type</em>' data type. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '<em>Java Class</em>' data type. <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
 		 * 
-		 * @see java.lang.Object
-		 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getObjectType()
+		 * @see java.lang.Class
+		 * @see org.eclipse.acceleo.query.ast.impl.AstPackageImpl#getJavaClass()
 		 * @generated
 		 */
-		EDataType OBJECT_TYPE = eINSTANCE.getObjectType();
+		EDataType JAVA_CLASS = eINSTANCE.getJavaClass();
 
 	}
 
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Binding.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Binding.java
index 79562e9..d80b92c 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Binding.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Binding.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/BooleanLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/BooleanLiteral.java
index f863bd7..da2a2e6 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/BooleanLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/BooleanLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -15,10 +15,10 @@
  * end-user-doc -->
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.BooleanLiteral#isValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getBooleanLiteral()
  * @model
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Call.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Call.java
index 8003c3a..7a03818 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Call.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Call.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -16,12 +16,12 @@
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Call</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.Call#getServiceName <em>Service Name</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.Call#getType <em>Type</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.Call#getArguments <em>Arguments</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getCall()
  * @model
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/CallType.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/CallType.java
index 9f7e2f9..9d2891b 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/CallType.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/CallType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -101,7 +101,8 @@
 	 * 
 	 * @generated
 	 */
-	private static final CallType[] VALUES_ARRAY = new CallType[] {CALLSERVICE, CALLORAPPLY, COLLECTIONCALL, };
+	private static final CallType[] VALUES_ARRAY = new CallType[] {CALLSERVICE, CALLORAPPLY,
+			COLLECTIONCALL, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Call Type</b></em>' enumerators. <!-- begin-user-doc -->
@@ -115,6 +116,9 @@
 	 * Returns the '<em><b>Call Type</b></em>' literal with the specified literal value. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
+	 * @param literal
+	 *            the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static CallType get(String literal) {
@@ -131,6 +135,9 @@
 	 * Returns the '<em><b>Call Type</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
+	 * @param name
+	 *            the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static CallType getByName(String name) {
@@ -147,6 +154,9 @@
 	 * Returns the '<em><b>Call Type</b></em>' literal with the specified integer value. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
+	 * @param value
+	 *            the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static CallType get(int value) {
@@ -198,6 +208,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public int getValue() {
 		return value;
 	}
@@ -207,6 +218,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -216,6 +228,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public String getLiteral() {
 		return literal;
 	}
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ClassTypeLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ClassTypeLiteral.java
new file mode 100644
index 0000000..973171d
--- /dev/null
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ClassTypeLiteral.java
@@ -0,0 +1,52 @@
+/**
+ *  Copyright (c) 2015, 2021 Obeo.
+ *  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:
+ *      Obeo - initial API and implementation
+ * 
+ */
+package org.eclipse.acceleo.query.ast;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Class Type Literal</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.acceleo.query.ast.ClassTypeLiteral#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.acceleo.query.ast.AstPackage#getClassTypeLiteral()
+ * @model
+ * @generated
+ */
+public interface ClassTypeLiteral extends TypeLiteral {
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
+	 * @return the value of the '<em>Value</em>' attribute.
+	 * @see #setValue(Class)
+	 * @see org.eclipse.acceleo.query.ast.AstPackage#getClassTypeLiteral_Value()
+	 * @model dataType="org.eclipse.acceleo.query.ast.JavaClass" required="true"
+	 * @generated
+	 */
+	Class getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.ClassTypeLiteral#getValue <em>Value</em>}'
+	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Value</em>' attribute.
+	 * @see #getValue()
+	 * @generated
+	 */
+	void setValue(Class value);
+
+} // ClassTypeLiteral
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/CollectionTypeLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/CollectionTypeLiteral.java
index b32c228..e43d23a 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/CollectionTypeLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/CollectionTypeLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -15,16 +15,16 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.CollectionTypeLiteral#getElementType <em>Element Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getCollectionTypeLiteral()
  * @model
  * @generated
  */
-public interface CollectionTypeLiteral extends TypeLiteral {
+public interface CollectionTypeLiteral extends ClassTypeLiteral {
 	/**
 	 * Returns the value of the '<em><b>Element Type</b></em>' containment reference. <!-- begin-user-doc -->
 	 * <p>
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Conditional.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Conditional.java
index 4d4c80a..58242be 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Conditional.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Conditional.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -16,12 +16,12 @@
  * end-user-doc -->
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.Conditional#getPredicate <em>Predicate</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.Conditional#getTrueBranch <em>True Branch</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.Conditional#getFalseBranch <em>False Branch</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getConditional()
  * @model
@@ -72,8 +72,8 @@
 	Expression getTrueBranch();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.Conditional#getTrueBranch
-	 * <em>True Branch</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.Conditional#getTrueBranch <em>True
+	 * Branch</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @param value
 	 *            the new value of the '<em>True Branch</em>' containment reference.
@@ -99,8 +99,8 @@
 	Expression getFalseBranch();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.Conditional#getFalseBranch
-	 * <em>False Branch</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.Conditional#getFalseBranch <em>False
+	 * Branch</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @param value
 	 *            the new value of the '<em>False Branch</em>' containment reference.
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/EClassifierTypeLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/EClassifierTypeLiteral.java
new file mode 100644
index 0000000..ac3dcdf
--- /dev/null
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/EClassifierTypeLiteral.java
@@ -0,0 +1,78 @@
+/**
+ *  Copyright (c) 2015, 2021 Obeo.
+ *  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:
+ *      Obeo - initial API and implementation
+ * 
+ */
+package org.eclipse.acceleo.query.ast;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>EClassifier Type Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.acceleo.query.ast.EClassifierTypeLiteral#getEPackageName <em>EPackage
+ * Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.query.ast.EClassifierTypeLiteral#getEClassifierName <em>EClassifier
+ * Name</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.acceleo.query.ast.AstPackage#getEClassifierTypeLiteral()
+ * @model
+ * @generated
+ */
+public interface EClassifierTypeLiteral extends TypeLiteral {
+	/**
+	 * Returns the value of the '<em><b>EPackage Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @return the value of the '<em>EPackage Name</em>' attribute.
+	 * @see #setEPackageName(String)
+	 * @see org.eclipse.acceleo.query.ast.AstPackage#getEClassifierTypeLiteral_EPackageName()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getEPackageName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.EClassifierTypeLiteral#getEPackageName
+	 * <em>EPackage Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>EPackage Name</em>' attribute.
+	 * @see #getEPackageName()
+	 * @generated
+	 */
+	void setEPackageName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>EClassifier Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @return the value of the '<em>EClassifier Name</em>' attribute.
+	 * @see #setEClassifierName(String)
+	 * @see org.eclipse.acceleo.query.ast.AstPackage#getEClassifierTypeLiteral_EClassifierName()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getEClassifierName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.EClassifierTypeLiteral#getEClassifierName
+	 * <em>EClassifier Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>EClassifier Name</em>' attribute.
+	 * @see #getEClassifierName()
+	 * @generated
+	 */
+	void setEClassifierName(String value);
+
+} // EClassifierTypeLiteral
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/EnumLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/EnumLiteral.java
index 56310b0..f71372e 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/EnumLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/EnumLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -10,17 +10,17 @@
  *******************************************************************************/
 package org.eclipse.acceleo.query.ast;
 
-import org.eclipse.emf.ecore.EEnumLiteral;
-
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Enum Literal</b></em>'. <!--
  * end-user-doc -->
  * <p>
  * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.acceleo.query.ast.EnumLiteral#getLiteral <em>Literal</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.acceleo.query.ast.EnumLiteral#getEPackageName <em>EPackage Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.query.ast.EnumLiteral#getEEnumName <em>EEnum Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.query.ast.EnumLiteral#getEEnumLiteralName <em>EEnum Literal Name</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getEnumLiteral()
  * @model
@@ -28,30 +28,72 @@
  */
 public interface EnumLiteral extends Literal {
 	/**
-	 * Returns the value of the '<em><b>Literal</b></em>' reference. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Literal</em>' reference isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
+	 * Returns the value of the '<em><b>EPackage Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
 	 * 
-	 * @return the value of the '<em>Literal</em>' reference.
-	 * @see #setLiteral(EEnumLiteral)
-	 * @see org.eclipse.acceleo.query.ast.AstPackage#getEnumLiteral_Literal()
-	 * @model
+	 * @return the value of the '<em>EPackage Name</em>' attribute.
+	 * @see #setEPackageName(String)
+	 * @see org.eclipse.acceleo.query.ast.AstPackage#getEnumLiteral_EPackageName()
+	 * @model required="true"
 	 * @generated
 	 */
-	EEnumLiteral getLiteral();
+	String getEPackageName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.EnumLiteral#getLiteral <em>Literal</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.EnumLiteral#getEPackageName <em>EPackage
+	 * Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @param value
-	 *            the new value of the '<em>Literal</em>' reference.
-	 * @see #getLiteral()
+	 *            the new value of the '<em>EPackage Name</em>' attribute.
+	 * @see #getEPackageName()
 	 * @generated
 	 */
-	void setLiteral(EEnumLiteral value);
+	void setEPackageName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>EEnum Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @return the value of the '<em>EEnum Name</em>' attribute.
+	 * @see #setEEnumName(String)
+	 * @see org.eclipse.acceleo.query.ast.AstPackage#getEnumLiteral_EEnumName()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getEEnumName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.EnumLiteral#getEEnumName <em>EEnum
+	 * Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>EEnum Name</em>' attribute.
+	 * @see #getEEnumName()
+	 * @generated
+	 */
+	void setEEnumName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>EEnum Literal Name</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @return the value of the '<em>EEnum Literal Name</em>' attribute.
+	 * @see #setEEnumLiteralName(String)
+	 * @see org.eclipse.acceleo.query.ast.AstPackage#getEnumLiteral_EEnumLiteralName()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getEEnumLiteralName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.EnumLiteral#getEEnumLiteralName <em>EEnum
+	 * Literal Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>EEnum Literal Name</em>' attribute.
+	 * @see #getEEnumLiteralName()
+	 * @generated
+	 */
+	void setEEnumLiteralName(String value);
 
 } // EnumLiteral
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Error.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Error.java
index 3c43443..339860a 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Error.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Error.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorBinding.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorBinding.java
index 7c52d34..022041b 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorBinding.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorBinding.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorCall.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorCall.java
index c7dee44..0b648ae 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorCall.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorCall.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -15,11 +15,11 @@
  * end-user-doc -->
  * <p>
  * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.acceleo.query.ast.ErrorCall#isMissingEndParenthesis <em>Missing End Parenthesis
- * </em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.acceleo.query.ast.ErrorCall#isMissingEndParenthesis <em>Missing End
+ * Parenthesis</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getErrorCall()
  * @model
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorConditional.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorConditional.java
index 48bb8ea..26c6885 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorConditional.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorConditional.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorEClassifierTypeLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorEClassifierTypeLiteral.java
index 850227d..4a04e34 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorEClassifierTypeLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorEClassifierTypeLiteral.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -12,13 +12,43 @@
 package org.eclipse.acceleo.query.ast;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Error EClassifier Type Literal</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Error EClassifier Type
+ * Literal</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.acceleo.query.ast.ErrorEClassifierTypeLiteral#isMissingColon <em>Missing
+ * Colon</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getErrorEClassifierTypeLiteral()
  * @model
  * @generated
  */
-public interface ErrorEClassifierTypeLiteral extends ErrorTypeLiteral {
+public interface ErrorEClassifierTypeLiteral extends org.eclipse.acceleo.query.ast.Error, EClassifierTypeLiteral {
+
+	/**
+	 * Returns the value of the '<em><b>Missing Colon</b></em>' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Missing Colon</em>' attribute.
+	 * @see #setMissingColon(boolean)
+	 * @see org.eclipse.acceleo.query.ast.AstPackage#getErrorEClassifierTypeLiteral_MissingColon()
+	 * @model required="true"
+	 * @generated
+	 */
+	boolean isMissingColon();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.ErrorEClassifierTypeLiteral#isMissingColon
+	 * <em>Missing Colon</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param value
+	 *            the new value of the '<em>Missing Colon</em>' attribute.
+	 * @see #isMissingColon()
+	 * @generated
+	 */
+	void setMissingColon(boolean value);
 
 } // ErrorEClassifierTypeLiteral
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorEnumLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorEnumLiteral.java
index 503e59e..3c2c933 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorEnumLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorEnumLiteral.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -11,18 +11,15 @@
  */
 package org.eclipse.acceleo.query.ast;
 
-import org.eclipse.emf.common.util.EList;
-
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Enum Literal</b></em>'. <!--
  * end-user-doc -->
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.acceleo.query.ast.ErrorEnumLiteral#getSegments <em>Segments</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.ErrorEnumLiteral#isMissingColon <em>Missing Colon</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getErrorEnumLiteral()
  * @model
@@ -30,22 +27,6 @@
  */
 public interface ErrorEnumLiteral extends org.eclipse.acceleo.query.ast.Error, EnumLiteral {
 	/**
-	 * Returns the value of the '<em><b>Segments</b></em>' attribute list. The list contents are of type
-	 * {@link java.lang.String}. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Segments</em>' attribute list isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Segments</em>' attribute list.
-	 * @see org.eclipse.acceleo.query.ast.AstPackage#getErrorEnumLiteral_Segments()
-	 * @model
-	 * @generated
-	 */
-	EList<String> getSegments();
-
-	/**
 	 * Returns the value of the '<em><b>Missing Colon</b></em>' attribute. <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Missing Colon</em>' attribute isn't clear, there really should be more of a
@@ -62,8 +43,8 @@
 	boolean isMissingColon();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.ErrorEnumLiteral#isMissingColon
-	 * <em>Missing Colon</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.ErrorEnumLiteral#isMissingColon <em>Missing
+	 * Colon</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @param value
 	 *            the new value of the '<em>Missing Colon</em>' attribute.
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorExpression.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorExpression.java
index bc99994..5ef563c 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorExpression.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorStringLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorStringLiteral.java
index 2c4e3f2..adff36d 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorStringLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorStringLiteral.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorTypeLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorTypeLiteral.java
index 0d592e5..83db39e 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorTypeLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorTypeLiteral.java
@@ -1,74 +1,23 @@
-/*******************************************************************************
- * Copyright (c) 2015 Obeo.
- * 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
+/**
+ *  Copyright (c) 2015, 2021 Obeo.
+ *  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:
+ *      Obeo - initial API and implementation
  * 
- * Contributors:
- *     Obeo - initial API and implementation
- *******************************************************************************/
+ */
 package org.eclipse.acceleo.query.ast;
 
-import org.eclipse.emf.common.util.EList;
-
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Error Type Literal</b></em>'. <!--
  * end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.acceleo.query.ast.ErrorTypeLiteral#getSegments <em>Segments</em>}</li>
- * <li>{@link org.eclipse.acceleo.query.ast.ErrorTypeLiteral#isMissingColon <em>Missing Colon</em>}</li>
- * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getErrorTypeLiteral()
  * @model
  * @generated
  */
 public interface ErrorTypeLiteral extends org.eclipse.acceleo.query.ast.Error, TypeLiteral {
-
-	/**
-	 * Returns the value of the '<em><b>Segments</b></em>' attribute list. The list contents are of type
-	 * {@link java.lang.String}. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Segments</em>' attribute list isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Segments</em>' attribute list.
-	 * @see org.eclipse.acceleo.query.ast.AstPackage#getErrorTypeLiteral_Segments()
-	 * @model
-	 * @generated
-	 */
-	EList<String> getSegments();
-
-	/**
-	 * Returns the value of the '<em><b>Missing Colon</b></em>' attribute. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Missing Colon</em>' attribute isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Missing Colon</em>' attribute.
-	 * @see #setMissingColon(boolean)
-	 * @see org.eclipse.acceleo.query.ast.AstPackage#getErrorTypeLiteral_MissingColon()
-	 * @model required="true"
-	 * @generated
-	 */
-	boolean isMissingColon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.ErrorTypeLiteral#isMissingColon
-	 * <em>Missing Colon</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Missing Colon</em>' attribute.
-	 * @see #isMissingColon()
-	 * @generated
-	 */
-	void setMissingColon(boolean value);
 } // ErrorTypeLiteral
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorVariableDeclaration.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorVariableDeclaration.java
index 9aa0596..2a73b79 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorVariableDeclaration.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/ErrorVariableDeclaration.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Expression.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Expression.java
index dde2dee..abed8d3 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Expression.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Expression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Implies.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Implies.java
index 6f5ac7e..20008d2 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Implies.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Implies.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/IntegerLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/IntegerLiteral.java
index 8115402..9e00f85 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/IntegerLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/IntegerLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -15,10 +15,10 @@
  * end-user-doc -->
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.IntegerLiteral#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getIntegerLiteral()
  * @model
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Lambda.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Lambda.java
index 41ec301..0df2d01 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Lambda.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Lambda.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Let.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Let.java
index 7c10dd6..20eae2f 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Let.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Let.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -17,11 +17,11 @@
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Let</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.Let#getBindings <em>Bindings</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.Let#getBody <em>Body</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getLet()
  * @model
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Literal.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Literal.java
index a061215..ee845d8 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Literal.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Literal.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/NullLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/NullLiteral.java
index 13c05a6..d42d328 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/NullLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/NullLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Or.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Or.java
index f256311..621059d 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Or.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/Or.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/RealLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/RealLiteral.java
index c90f8ba..2ca9480 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/RealLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/RealLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -15,10 +15,10 @@
  * end-user-doc -->
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.RealLiteral#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getRealLiteral()
  * @model
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/SequenceInExtensionLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/SequenceInExtensionLiteral.java
index 3ad2034..dc0116e 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/SequenceInExtensionLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/SequenceInExtensionLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -17,10 +17,10 @@
  * end-user-doc -->
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.SequenceInExtensionLiteral#getValues <em>Values</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getSequenceInExtensionLiteral()
  * @model
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/SetInExtensionLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/SetInExtensionLiteral.java
index 2de5bd6..a6b6891 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/SetInExtensionLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/SetInExtensionLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -17,10 +17,10 @@
  * end-user-doc -->
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.SetInExtensionLiteral#getValues <em>Values</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getSetInExtensionLiteral()
  * @model
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/StringLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/StringLiteral.java
index 89db7d9..d720858 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/StringLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/StringLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -15,10 +15,10 @@
  * end-user-doc -->
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.StringLiteral#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getStringLiteral()
  * @model
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/TypeLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/TypeLiteral.java
index 692b96c..acc1cf7 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/TypeLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/TypeLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -13,43 +13,11 @@
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Type Literal</b></em>'. <!--
  * end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.acceleo.query.ast.TypeLiteral#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getTypeLiteral()
- * @model
+ * @model interface="true" abstract="true"
  * @generated
  */
 public interface TypeLiteral extends Literal {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(Object)
-	 * @see org.eclipse.acceleo.query.ast.AstPackage#getTypeLiteral_Value()
-	 * @model dataType="org.eclipse.acceleo.query.ast.ObjectType" required="true"
-	 * @generated
-	 */
-	Object getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.TypeLiteral#getValue <em>Value</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(Object value);
 
 } // TypeLiteral
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/TypeSetLiteral.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/TypeSetLiteral.java
index 5a4c685..9ab74ca 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/TypeSetLiteral.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/TypeSetLiteral.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -18,16 +18,16 @@
  * end-user-doc -->
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.TypeSetLiteral#getTypes <em>Types</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getTypeSetLiteral()
  * @model
  * @generated
  */
-public interface TypeSetLiteral extends TypeLiteral {
+public interface TypeSetLiteral extends ClassTypeLiteral {
 	/**
 	 * Returns the value of the '<em><b>Types</b></em>' containment reference list. The list contents are of
 	 * type {@link org.eclipse.acceleo.query.ast.TypeLiteral}. <!-- begin-user-doc -->
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/VarRef.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/VarRef.java
index 6401d2b..e64d4f9 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/VarRef.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/VarRef.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -42,8 +42,8 @@
 	String getVariableName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.VarRef#getVariableName
-	 * <em>Variable Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.acceleo.query.ast.VarRef#getVariableName <em>Variable
+	 * Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @param value
 	 *            the new value of the '<em>Variable Name</em>' attribute.
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/VariableDeclaration.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/VariableDeclaration.java
index 53b945a..41dd4ee 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/VariableDeclaration.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/VariableDeclaration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -17,12 +17,12 @@
  * end-user-doc -->
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.VariableDeclaration#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.VariableDeclaration#getType <em>Type</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.VariableDeclaration#getExpression <em>Expression</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.acceleo.query.ast.AstPackage#getVariableDeclaration()
  * @model
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/AndImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/AndImpl.java
index c199ff9..c7a4841 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/AndImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/AndImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -17,8 +17,6 @@
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>And</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/AstFactoryImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/AstFactoryImpl.java
index 7eac8af..b8f9e19 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/AstFactoryImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/AstFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -18,8 +18,10 @@
 import org.eclipse.acceleo.query.ast.BooleanLiteral;
 import org.eclipse.acceleo.query.ast.Call;
 import org.eclipse.acceleo.query.ast.CallType;
+import org.eclipse.acceleo.query.ast.ClassTypeLiteral;
 import org.eclipse.acceleo.query.ast.CollectionTypeLiteral;
 import org.eclipse.acceleo.query.ast.Conditional;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
 import org.eclipse.acceleo.query.ast.EnumLiteral;
 import org.eclipse.acceleo.query.ast.ErrorBinding;
 import org.eclipse.acceleo.query.ast.ErrorCall;
@@ -41,7 +43,6 @@
 import org.eclipse.acceleo.query.ast.SequenceInExtensionLiteral;
 import org.eclipse.acceleo.query.ast.SetInExtensionLiteral;
 import org.eclipse.acceleo.query.ast.StringLiteral;
-import org.eclipse.acceleo.query.ast.TypeLiteral;
 import org.eclipse.acceleo.query.ast.TypeSetLiteral;
 import org.eclipse.acceleo.query.ast.VarRef;
 import org.eclipse.acceleo.query.ast.VariableDeclaration;
@@ -108,8 +109,10 @@
 				return createBooleanLiteral();
 			case AstPackage.ENUM_LITERAL:
 				return createEnumLiteral();
-			case AstPackage.TYPE_LITERAL:
-				return createTypeLiteral();
+			case AstPackage.ECLASSIFIER_TYPE_LITERAL:
+				return createEClassifierTypeLiteral();
+			case AstPackage.CLASS_TYPE_LITERAL:
+				return createClassTypeLiteral();
 			case AstPackage.TYPE_SET_LITERAL:
 				return createTypeSetLiteral();
 			case AstPackage.COLLECTION_TYPE_LITERAL:
@@ -170,8 +173,8 @@
 		switch (eDataType.getClassifierID()) {
 			case AstPackage.CALL_TYPE:
 				return createCallTypeFromString(eDataType, initialValue);
-			case AstPackage.OBJECT_TYPE:
-				return createObjectTypeFromString(eDataType, initialValue);
+			case AstPackage.JAVA_CLASS:
+				return createJavaClassFromString(eDataType, initialValue);
 			default:
 				throw new IllegalArgumentException("The datatype '" + eDataType.getName()
 						+ "' is not a valid classifier");
@@ -188,8 +191,8 @@
 		switch (eDataType.getClassifierID()) {
 			case AstPackage.CALL_TYPE:
 				return convertCallTypeToString(eDataType, instanceValue);
-			case AstPackage.OBJECT_TYPE:
-				return convertObjectTypeToString(eDataType, instanceValue);
+			case AstPackage.JAVA_CLASS:
+				return convertJavaClassToString(eDataType, instanceValue);
 			default:
 				throw new IllegalArgumentException("The datatype '" + eDataType.getName()
 						+ "' is not a valid classifier");
@@ -201,6 +204,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public VarRef createVarRef() {
 		VarRefImpl varRef = new VarRefImpl();
 		return varRef;
@@ -211,6 +215,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Call createCall() {
 		CallImpl call = new CallImpl();
 		return call;
@@ -221,6 +226,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Literal createLiteral() {
 		LiteralImpl literal = new LiteralImpl();
 		return literal;
@@ -231,6 +237,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public IntegerLiteral createIntegerLiteral() {
 		IntegerLiteralImpl integerLiteral = new IntegerLiteralImpl();
 		return integerLiteral;
@@ -241,6 +248,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public RealLiteral createRealLiteral() {
 		RealLiteralImpl realLiteral = new RealLiteralImpl();
 		return realLiteral;
@@ -251,6 +259,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public StringLiteral createStringLiteral() {
 		StringLiteralImpl stringLiteral = new StringLiteralImpl();
 		return stringLiteral;
@@ -261,6 +270,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public BooleanLiteral createBooleanLiteral() {
 		BooleanLiteralImpl booleanLiteral = new BooleanLiteralImpl();
 		return booleanLiteral;
@@ -271,6 +281,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EnumLiteral createEnumLiteral() {
 		EnumLiteralImpl enumLiteral = new EnumLiteralImpl();
 		return enumLiteral;
@@ -281,9 +292,10 @@
 	 * 
 	 * @generated
 	 */
-	public TypeLiteral createTypeLiteral() {
-		TypeLiteralImpl typeLiteral = new TypeLiteralImpl();
-		return typeLiteral;
+	@Override
+	public EClassifierTypeLiteral createEClassifierTypeLiteral() {
+		EClassifierTypeLiteralImpl eClassifierTypeLiteral = new EClassifierTypeLiteralImpl();
+		return eClassifierTypeLiteral;
 	}
 
 	/**
@@ -291,6 +303,18 @@
 	 * 
 	 * @generated
 	 */
+	@Override
+	public ClassTypeLiteral createClassTypeLiteral() {
+		ClassTypeLiteralImpl classTypeLiteral = new ClassTypeLiteralImpl();
+		return classTypeLiteral;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
 	public TypeSetLiteral createTypeSetLiteral() {
 		TypeSetLiteralImpl typeSetLiteral = new TypeSetLiteralImpl();
 		return typeSetLiteral;
@@ -301,6 +325,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public CollectionTypeLiteral createCollectionTypeLiteral() {
 		CollectionTypeLiteralImpl collectionTypeLiteral = new CollectionTypeLiteralImpl();
 		return collectionTypeLiteral;
@@ -311,6 +336,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Lambda createLambda() {
 		LambdaImpl lambda = new LambdaImpl();
 		return lambda;
@@ -321,6 +347,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public NullLiteral createNullLiteral() {
 		NullLiteralImpl nullLiteral = new NullLiteralImpl();
 		return nullLiteral;
@@ -331,6 +358,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public SetInExtensionLiteral createSetInExtensionLiteral() {
 		SetInExtensionLiteralImpl setInExtensionLiteral = new SetInExtensionLiteralImpl();
 		return setInExtensionLiteral;
@@ -341,6 +369,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public SequenceInExtensionLiteral createSequenceInExtensionLiteral() {
 		SequenceInExtensionLiteralImpl sequenceInExtensionLiteral = new SequenceInExtensionLiteralImpl();
 		return sequenceInExtensionLiteral;
@@ -351,6 +380,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public VariableDeclaration createVariableDeclaration() {
 		VariableDeclarationImpl variableDeclaration = new VariableDeclarationImpl();
 		return variableDeclaration;
@@ -361,6 +391,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public ErrorExpression createErrorExpression() {
 		ErrorExpressionImpl errorExpression = new ErrorExpressionImpl();
 		return errorExpression;
@@ -371,6 +402,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public ErrorTypeLiteral createErrorTypeLiteral() {
 		ErrorTypeLiteralImpl errorTypeLiteral = new ErrorTypeLiteralImpl();
 		return errorTypeLiteral;
@@ -381,6 +413,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public ErrorEClassifierTypeLiteral createErrorEClassifierTypeLiteral() {
 		ErrorEClassifierTypeLiteralImpl errorEClassifierTypeLiteral = new ErrorEClassifierTypeLiteralImpl();
 		return errorEClassifierTypeLiteral;
@@ -391,6 +424,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public ErrorEnumLiteral createErrorEnumLiteral() {
 		ErrorEnumLiteralImpl errorEnumLiteral = new ErrorEnumLiteralImpl();
 		return errorEnumLiteral;
@@ -401,6 +435,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public ErrorCall createErrorCall() {
 		ErrorCallImpl errorCall = new ErrorCallImpl();
 		return errorCall;
@@ -411,6 +446,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public ErrorVariableDeclaration createErrorVariableDeclaration() {
 		ErrorVariableDeclarationImpl errorVariableDeclaration = new ErrorVariableDeclarationImpl();
 		return errorVariableDeclaration;
@@ -421,6 +457,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public ErrorStringLiteral createErrorStringLiteral() {
 		ErrorStringLiteralImpl errorStringLiteral = new ErrorStringLiteralImpl();
 		return errorStringLiteral;
@@ -431,6 +468,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public ErrorConditional createErrorConditional() {
 		ErrorConditionalImpl errorConditional = new ErrorConditionalImpl();
 		return errorConditional;
@@ -441,6 +479,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Binding createBinding() {
 		BindingImpl binding = new BindingImpl();
 		return binding;
@@ -451,6 +490,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public ErrorBinding createErrorBinding() {
 		ErrorBindingImpl errorBinding = new ErrorBindingImpl();
 		return errorBinding;
@@ -461,6 +501,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Let createLet() {
 		LetImpl let = new LetImpl();
 		return let;
@@ -471,6 +512,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Conditional createConditional() {
 		ConditionalImpl conditional = new ConditionalImpl();
 		return conditional;
@@ -481,6 +523,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Or createOr() {
 		OrImpl or = new OrImpl();
 		return or;
@@ -491,6 +534,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public And createAnd() {
 		AndImpl and = new AndImpl();
 		return and;
@@ -501,6 +545,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Implies createImplies() {
 		ImpliesImpl implies = new ImpliesImpl();
 		return implies;
@@ -533,8 +578,8 @@
 	 * 
 	 * @generated
 	 */
-	public Object createObjectTypeFromString(EDataType eDataType, String initialValue) {
-		return super.createFromString(eDataType, initialValue);
+	public Class createJavaClassFromString(EDataType eDataType, String initialValue) {
+		return (Class)super.createFromString(eDataType, initialValue);
 	}
 
 	/**
@@ -542,7 +587,7 @@
 	 * 
 	 * @generated
 	 */
-	public String convertObjectTypeToString(EDataType eDataType, Object instanceValue) {
+	public String convertJavaClassToString(EDataType eDataType, Object instanceValue) {
 		return super.convertToString(eDataType, instanceValue);
 	}
 
@@ -551,6 +596,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public AstPackage getAstPackage() {
 		return (AstPackage)getEPackage();
 	}
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/AstPackageImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/AstPackageImpl.java
index 1303fe8..5c244b4 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/AstPackageImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/AstPackageImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -18,8 +18,10 @@
 import org.eclipse.acceleo.query.ast.BooleanLiteral;
 import org.eclipse.acceleo.query.ast.Call;
 import org.eclipse.acceleo.query.ast.CallType;
+import org.eclipse.acceleo.query.ast.ClassTypeLiteral;
 import org.eclipse.acceleo.query.ast.CollectionTypeLiteral;
 import org.eclipse.acceleo.query.ast.Conditional;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
 import org.eclipse.acceleo.query.ast.EnumLiteral;
 import org.eclipse.acceleo.query.ast.ErrorBinding;
 import org.eclipse.acceleo.query.ast.ErrorCall;
@@ -52,7 +54,6 @@
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
@@ -136,6 +137,20 @@
 	 * 
 	 * @generated
 	 */
+	private EClass eClassifierTypeLiteralEClass = null;
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	private EClass classTypeLiteralEClass = null;
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
 	private EClass typeSetLiteralEClass = null;
 
 	/**
@@ -304,7 +319,7 @@
 	 * 
 	 * @generated
 	 */
-	private EDataType objectTypeEDataType = null;
+	private EDataType javaClassEDataType = null;
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
@@ -348,15 +363,13 @@
 			return (AstPackage)EPackage.Registry.INSTANCE.getEPackage(AstPackage.eNS_URI);
 
 		// Obtain or create and register package
-		AstPackageImpl theAstPackage = (AstPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof AstPackageImpl ? EPackage.Registry.INSTANCE
-				.get(eNS_URI)
-				: new AstPackageImpl());
+		Object registeredAstPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		AstPackageImpl theAstPackage = registeredAstPackage instanceof AstPackageImpl
+				? (AstPackageImpl)registeredAstPackage
+				: new AstPackageImpl();
 
 		isInited = true;
 
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-
 		// Create package meta-data objects
 		theAstPackage.createPackageContents();
 
@@ -376,6 +389,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getExpression() {
 		return expressionEClass;
 	}
@@ -385,6 +399,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getVarRef() {
 		return varRefEClass;
 	}
@@ -394,6 +409,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EAttribute getVarRef_VariableName() {
 		return (EAttribute)varRefEClass.getEStructuralFeatures().get(0);
 	}
@@ -403,6 +419,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getCall() {
 		return callEClass;
 	}
@@ -412,6 +429,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EAttribute getCall_ServiceName() {
 		return (EAttribute)callEClass.getEStructuralFeatures().get(0);
 	}
@@ -421,6 +439,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EAttribute getCall_Type() {
 		return (EAttribute)callEClass.getEStructuralFeatures().get(1);
 	}
@@ -430,6 +449,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getCall_Arguments() {
 		return (EReference)callEClass.getEStructuralFeatures().get(2);
 	}
@@ -439,6 +459,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getLiteral() {
 		return literalEClass;
 	}
@@ -448,6 +469,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getIntegerLiteral() {
 		return integerLiteralEClass;
 	}
@@ -457,6 +479,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EAttribute getIntegerLiteral_Value() {
 		return (EAttribute)integerLiteralEClass.getEStructuralFeatures().get(0);
 	}
@@ -466,6 +489,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getRealLiteral() {
 		return realLiteralEClass;
 	}
@@ -475,6 +499,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EAttribute getRealLiteral_Value() {
 		return (EAttribute)realLiteralEClass.getEStructuralFeatures().get(0);
 	}
@@ -484,6 +509,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getStringLiteral() {
 		return stringLiteralEClass;
 	}
@@ -493,6 +519,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EAttribute getStringLiteral_Value() {
 		return (EAttribute)stringLiteralEClass.getEStructuralFeatures().get(0);
 	}
@@ -502,6 +529,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getBooleanLiteral() {
 		return booleanLiteralEClass;
 	}
@@ -511,6 +539,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EAttribute getBooleanLiteral_Value() {
 		return (EAttribute)booleanLiteralEClass.getEStructuralFeatures().get(0);
 	}
@@ -520,6 +549,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getEnumLiteral() {
 		return enumLiteralEClass;
 	}
@@ -529,8 +559,9 @@
 	 * 
 	 * @generated
 	 */
-	public EReference getEnumLiteral_Literal() {
-		return (EReference)enumLiteralEClass.getEStructuralFeatures().get(0);
+	@Override
+	public EAttribute getEnumLiteral_EPackageName() {
+		return (EAttribute)enumLiteralEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -538,6 +569,27 @@
 	 * 
 	 * @generated
 	 */
+	@Override
+	public EAttribute getEnumLiteral_EEnumName() {
+		return (EAttribute)enumLiteralEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public EAttribute getEnumLiteral_EEnumLiteralName() {
+		return (EAttribute)enumLiteralEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
 	public EClass getTypeLiteral() {
 		return typeLiteralEClass;
 	}
@@ -547,8 +599,9 @@
 	 * 
 	 * @generated
 	 */
-	public EAttribute getTypeLiteral_Value() {
-		return (EAttribute)typeLiteralEClass.getEStructuralFeatures().get(0);
+	@Override
+	public EClass getEClassifierTypeLiteral() {
+		return eClassifierTypeLiteralEClass;
 	}
 
 	/**
@@ -556,6 +609,47 @@
 	 * 
 	 * @generated
 	 */
+	@Override
+	public EAttribute getEClassifierTypeLiteral_EPackageName() {
+		return (EAttribute)eClassifierTypeLiteralEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public EAttribute getEClassifierTypeLiteral_EClassifierName() {
+		return (EAttribute)eClassifierTypeLiteralEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public EClass getClassTypeLiteral() {
+		return classTypeLiteralEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public EAttribute getClassTypeLiteral_Value() {
+		return (EAttribute)classTypeLiteralEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
 	public EClass getTypeSetLiteral() {
 		return typeSetLiteralEClass;
 	}
@@ -565,6 +659,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getTypeSetLiteral_Types() {
 		return (EReference)typeSetLiteralEClass.getEStructuralFeatures().get(0);
 	}
@@ -574,6 +669,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getCollectionTypeLiteral() {
 		return collectionTypeLiteralEClass;
 	}
@@ -583,6 +679,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getCollectionTypeLiteral_ElementType() {
 		return (EReference)collectionTypeLiteralEClass.getEStructuralFeatures().get(0);
 	}
@@ -592,6 +689,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getLambda() {
 		return lambdaEClass;
 	}
@@ -601,6 +699,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getLambda_Parameters() {
 		return (EReference)lambdaEClass.getEStructuralFeatures().get(0);
 	}
@@ -610,6 +709,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getLambda_Expression() {
 		return (EReference)lambdaEClass.getEStructuralFeatures().get(1);
 	}
@@ -619,6 +719,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getNullLiteral() {
 		return nullLiteralEClass;
 	}
@@ -628,6 +729,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getSetInExtensionLiteral() {
 		return setInExtensionLiteralEClass;
 	}
@@ -637,6 +739,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getSetInExtensionLiteral_Values() {
 		return (EReference)setInExtensionLiteralEClass.getEStructuralFeatures().get(0);
 	}
@@ -646,6 +749,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getSequenceInExtensionLiteral() {
 		return sequenceInExtensionLiteralEClass;
 	}
@@ -655,6 +759,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getSequenceInExtensionLiteral_Values() {
 		return (EReference)sequenceInExtensionLiteralEClass.getEStructuralFeatures().get(0);
 	}
@@ -664,6 +769,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getVariableDeclaration() {
 		return variableDeclarationEClass;
 	}
@@ -673,6 +779,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EAttribute getVariableDeclaration_Name() {
 		return (EAttribute)variableDeclarationEClass.getEStructuralFeatures().get(0);
 	}
@@ -682,6 +789,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getVariableDeclaration_Type() {
 		return (EReference)variableDeclarationEClass.getEStructuralFeatures().get(1);
 	}
@@ -691,6 +799,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getVariableDeclaration_Expression() {
 		return (EReference)variableDeclarationEClass.getEStructuralFeatures().get(2);
 	}
@@ -700,6 +809,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getError() {
 		return errorEClass;
 	}
@@ -709,6 +819,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getErrorExpression() {
 		return errorExpressionEClass;
 	}
@@ -718,6 +829,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getErrorTypeLiteral() {
 		return errorTypeLiteralEClass;
 	}
@@ -727,24 +839,7 @@
 	 * 
 	 * @generated
 	 */
-	public EAttribute getErrorTypeLiteral_Segments() {
-		return (EAttribute)errorTypeLiteralEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getErrorTypeLiteral_MissingColon() {
-		return (EAttribute)errorTypeLiteralEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
+	@Override
 	public EClass getErrorEClassifierTypeLiteral() {
 		return errorEClassifierTypeLiteralEClass;
 	}
@@ -754,6 +849,17 @@
 	 * 
 	 * @generated
 	 */
+	@Override
+	public EAttribute getErrorEClassifierTypeLiteral_MissingColon() {
+		return (EAttribute)errorEClassifierTypeLiteralEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
 	public EClass getErrorEnumLiteral() {
 		return errorEnumLiteralEClass;
 	}
@@ -763,7 +869,8 @@
 	 * 
 	 * @generated
 	 */
-	public EAttribute getErrorEnumLiteral_Segments() {
+	@Override
+	public EAttribute getErrorEnumLiteral_MissingColon() {
 		return (EAttribute)errorEnumLiteralEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -772,15 +879,7 @@
 	 * 
 	 * @generated
 	 */
-	public EAttribute getErrorEnumLiteral_MissingColon() {
-		return (EAttribute)errorEnumLiteralEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
+	@Override
 	public EClass getErrorCall() {
 		return errorCallEClass;
 	}
@@ -790,6 +889,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EAttribute getErrorCall_MissingEndParenthesis() {
 		return (EAttribute)errorCallEClass.getEStructuralFeatures().get(0);
 	}
@@ -799,6 +899,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getErrorVariableDeclaration() {
 		return errorVariableDeclarationEClass;
 	}
@@ -808,6 +909,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getErrorStringLiteral() {
 		return errorStringLiteralEClass;
 	}
@@ -817,6 +919,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getErrorConditional() {
 		return errorConditionalEClass;
 	}
@@ -826,6 +929,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getBinding() {
 		return bindingEClass;
 	}
@@ -835,6 +939,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EAttribute getBinding_Name() {
 		return (EAttribute)bindingEClass.getEStructuralFeatures().get(0);
 	}
@@ -844,6 +949,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getBinding_Type() {
 		return (EReference)bindingEClass.getEStructuralFeatures().get(1);
 	}
@@ -853,6 +959,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getBinding_Value() {
 		return (EReference)bindingEClass.getEStructuralFeatures().get(2);
 	}
@@ -862,6 +969,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getErrorBinding() {
 		return errorBindingEClass;
 	}
@@ -871,6 +979,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getLet() {
 		return letEClass;
 	}
@@ -880,6 +989,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getLet_Bindings() {
 		return (EReference)letEClass.getEStructuralFeatures().get(0);
 	}
@@ -889,6 +999,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getLet_Body() {
 		return (EReference)letEClass.getEStructuralFeatures().get(1);
 	}
@@ -898,6 +1009,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getConditional() {
 		return conditionalEClass;
 	}
@@ -907,6 +1019,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getConditional_Predicate() {
 		return (EReference)conditionalEClass.getEStructuralFeatures().get(0);
 	}
@@ -916,6 +1029,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getConditional_TrueBranch() {
 		return (EReference)conditionalEClass.getEStructuralFeatures().get(1);
 	}
@@ -925,6 +1039,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EReference getConditional_FalseBranch() {
 		return (EReference)conditionalEClass.getEStructuralFeatures().get(2);
 	}
@@ -934,6 +1049,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getOr() {
 		return orEClass;
 	}
@@ -943,6 +1059,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getAnd() {
 		return andEClass;
 	}
@@ -952,6 +1069,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EClass getImplies() {
 		return impliesEClass;
 	}
@@ -961,6 +1079,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EEnum getCallType() {
 		return callTypeEEnum;
 	}
@@ -970,8 +1089,9 @@
 	 * 
 	 * @generated
 	 */
-	public EDataType getObjectType() {
-		return objectTypeEDataType;
+	@Override
+	public EDataType getJavaClass() {
+		return javaClassEDataType;
 	}
 
 	/**
@@ -979,6 +1099,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public AstFactory getAstFactory() {
 		return (AstFactory)getEFactoryInstance();
 	}
@@ -1027,10 +1148,18 @@
 		createEAttribute(booleanLiteralEClass, BOOLEAN_LITERAL__VALUE);
 
 		enumLiteralEClass = createEClass(ENUM_LITERAL);
-		createEReference(enumLiteralEClass, ENUM_LITERAL__LITERAL);
+		createEAttribute(enumLiteralEClass, ENUM_LITERAL__EPACKAGE_NAME);
+		createEAttribute(enumLiteralEClass, ENUM_LITERAL__EENUM_NAME);
+		createEAttribute(enumLiteralEClass, ENUM_LITERAL__EENUM_LITERAL_NAME);
 
 		typeLiteralEClass = createEClass(TYPE_LITERAL);
-		createEAttribute(typeLiteralEClass, TYPE_LITERAL__VALUE);
+
+		eClassifierTypeLiteralEClass = createEClass(ECLASSIFIER_TYPE_LITERAL);
+		createEAttribute(eClassifierTypeLiteralEClass, ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME);
+		createEAttribute(eClassifierTypeLiteralEClass, ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME);
+
+		classTypeLiteralEClass = createEClass(CLASS_TYPE_LITERAL);
+		createEAttribute(classTypeLiteralEClass, CLASS_TYPE_LITERAL__VALUE);
 
 		typeSetLiteralEClass = createEClass(TYPE_SET_LITERAL);
 		createEReference(typeSetLiteralEClass, TYPE_SET_LITERAL__TYPES);
@@ -1060,13 +1189,11 @@
 		errorExpressionEClass = createEClass(ERROR_EXPRESSION);
 
 		errorTypeLiteralEClass = createEClass(ERROR_TYPE_LITERAL);
-		createEAttribute(errorTypeLiteralEClass, ERROR_TYPE_LITERAL__SEGMENTS);
-		createEAttribute(errorTypeLiteralEClass, ERROR_TYPE_LITERAL__MISSING_COLON);
 
 		errorEClassifierTypeLiteralEClass = createEClass(ERROR_ECLASSIFIER_TYPE_LITERAL);
+		createEAttribute(errorEClassifierTypeLiteralEClass, ERROR_ECLASSIFIER_TYPE_LITERAL__MISSING_COLON);
 
 		errorEnumLiteralEClass = createEClass(ERROR_ENUM_LITERAL);
-		createEAttribute(errorEnumLiteralEClass, ERROR_ENUM_LITERAL__SEGMENTS);
 		createEAttribute(errorEnumLiteralEClass, ERROR_ENUM_LITERAL__MISSING_COLON);
 
 		errorCallEClass = createEClass(ERROR_CALL);
@@ -1104,7 +1231,7 @@
 		callTypeEEnum = createEEnum(CALL_TYPE);
 
 		// Create data types
-		objectTypeEDataType = createEDataType(OBJECT_TYPE);
+		javaClassEDataType = createEDataType(JAVA_CLASS);
 	}
 
 	/**
@@ -1130,10 +1257,6 @@
 		setNsPrefix(eNS_PREFIX);
 		setNsURI(eNS_URI);
 
-		// Obtain other dependent packages
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE
-				.getEPackage(EcorePackage.eNS_URI);
-
 		// Create type parameters
 
 		// Set bounds for type parameters
@@ -1148,8 +1271,10 @@
 		booleanLiteralEClass.getESuperTypes().add(this.getLiteral());
 		enumLiteralEClass.getESuperTypes().add(this.getLiteral());
 		typeLiteralEClass.getESuperTypes().add(this.getLiteral());
-		typeSetLiteralEClass.getESuperTypes().add(this.getTypeLiteral());
-		collectionTypeLiteralEClass.getESuperTypes().add(this.getTypeLiteral());
+		eClassifierTypeLiteralEClass.getESuperTypes().add(this.getTypeLiteral());
+		classTypeLiteralEClass.getESuperTypes().add(this.getTypeLiteral());
+		typeSetLiteralEClass.getESuperTypes().add(this.getClassTypeLiteral());
+		collectionTypeLiteralEClass.getESuperTypes().add(this.getClassTypeLiteral());
 		lambdaEClass.getESuperTypes().add(this.getLiteral());
 		nullLiteralEClass.getESuperTypes().add(this.getLiteral());
 		setInExtensionLiteralEClass.getESuperTypes().add(this.getLiteral());
@@ -1158,7 +1283,8 @@
 		errorExpressionEClass.getESuperTypes().add(this.getError());
 		errorTypeLiteralEClass.getESuperTypes().add(this.getError());
 		errorTypeLiteralEClass.getESuperTypes().add(this.getTypeLiteral());
-		errorEClassifierTypeLiteralEClass.getESuperTypes().add(this.getErrorTypeLiteral());
+		errorEClassifierTypeLiteralEClass.getESuperTypes().add(this.getError());
+		errorEClassifierTypeLiteralEClass.getESuperTypes().add(this.getEClassifierTypeLiteral());
 		errorEnumLiteralEClass.getESuperTypes().add(this.getError());
 		errorEnumLiteralEClass.getESuperTypes().add(this.getEnumLiteral());
 		errorCallEClass.getESuperTypes().add(this.getError());
@@ -1194,8 +1320,8 @@
 		initEAttribute(getCall_Type(), this.getCallType(), "type", null, 0, 1, Call.class, !IS_TRANSIENT,
 				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getCall_Arguments(), this.getExpression(), null, "arguments", null, 0, -1, Call.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(literalEClass, Literal.class, "Literal", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
@@ -1226,15 +1352,33 @@
 
 		initEClass(enumLiteralEClass, EnumLiteral.class, "EnumLiteral", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEnumLiteral_Literal(), theEcorePackage.getEEnumLiteral(), null, "literal", null, 0,
-				1, EnumLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getEnumLiteral_EPackageName(), ecorePackage.getEString(), "ePackageName", null, 1, 1,
+				EnumLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getEnumLiteral_EEnumName(), ecorePackage.getEString(), "eEnumName", null, 1, 1,
+				EnumLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getEnumLiteral_EEnumLiteralName(), ecorePackage.getEString(), "eEnumLiteralName", null,
+				1, 1, EnumLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(typeLiteralEClass, TypeLiteral.class, "TypeLiteral", !IS_ABSTRACT, !IS_INTERFACE,
+		initEClass(typeLiteralEClass, TypeLiteral.class, "TypeLiteral", IS_ABSTRACT, IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTypeLiteral_Value(), this.getObjectType(), "value", null, 1, 1, TypeLiteral.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
+
+		initEClass(eClassifierTypeLiteralEClass, EClassifierTypeLiteral.class, "EClassifierTypeLiteral",
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getEClassifierTypeLiteral_EPackageName(), ecorePackage.getEString(), "ePackageName",
+				null, 1, 1, EClassifierTypeLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getEClassifierTypeLiteral_EClassifierName(), ecorePackage.getEString(),
+				"eClassifierName", null, 1, 1, EClassifierTypeLiteral.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(classTypeLiteralEClass, ClassTypeLiteral.class, "ClassTypeLiteral", !IS_ABSTRACT,
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getClassTypeLiteral_Value(), this.getJavaClass(), "value", null, 1, 1,
+				ClassTypeLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(typeSetLiteralEClass, TypeSetLiteral.class, "TypeSetLiteral", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
@@ -1250,9 +1394,9 @@
 
 		initEClass(lambdaEClass, Lambda.class, "Lambda", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLambda_Parameters(), this.getVariableDeclaration(), null, "parameters", null, 0,
-				-1, Lambda.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getLambda_Parameters(), this.getVariableDeclaration(), null, "parameters", null, 0, -1,
+				Lambda.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getLambda_Expression(), this.getExpression(), null, "expression", null, 1, 1,
 				Lambda.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
 				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1275,38 +1419,32 @@
 		initEClass(variableDeclarationEClass, VariableDeclaration.class, "VariableDeclaration", !IS_ABSTRACT,
 				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getVariableDeclaration_Name(), ecorePackage.getEString(), "name", null, 1, 1,
-				VariableDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-				!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+				VariableDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getVariableDeclaration_Type(), this.getTypeLiteral(), null, "type", null, 0, 1,
 				VariableDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
 				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getVariableDeclaration_Expression(), this.getExpression(), null, "expression", null,
-				1, 1, VariableDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+		initEReference(getVariableDeclaration_Expression(), this.getExpression(), null, "expression", null, 1,
+				1, VariableDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
 				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(errorEClass, org.eclipse.acceleo.query.ast.Error.class, "Error", IS_ABSTRACT,
-				IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(errorEClass, org.eclipse.acceleo.query.ast.Error.class, "Error", IS_ABSTRACT, IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(errorExpressionEClass, ErrorExpression.class, "ErrorExpression", !IS_ABSTRACT,
 				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(errorTypeLiteralEClass, ErrorTypeLiteral.class, "ErrorTypeLiteral", !IS_ABSTRACT,
 				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getErrorTypeLiteral_Segments(), ecorePackage.getEString(), "segments", null, 0, -1,
-				ErrorTypeLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getErrorTypeLiteral_MissingColon(), ecorePackage.getEBoolean(), "missingColon", null,
-				1, 1, ErrorTypeLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-				!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(errorEClassifierTypeLiteralEClass, ErrorEClassifierTypeLiteral.class,
 				"ErrorEClassifierTypeLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getErrorEClassifierTypeLiteral_MissingColon(), ecorePackage.getEBoolean(),
+				"missingColon", null, 1, 1, ErrorEClassifierTypeLiteral.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(errorEnumLiteralEClass, ErrorEnumLiteral.class, "ErrorEnumLiteral", !IS_ABSTRACT,
 				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getErrorEnumLiteral_Segments(), ecorePackage.getEString(), "segments", null, 0, -1,
-				ErrorEnumLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getErrorEnumLiteral_MissingColon(), ecorePackage.getEBoolean(), "missingColon", null,
 				1, 1, ErrorEnumLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
 				!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1317,8 +1455,8 @@
 				"missingEndParenthesis", "false", 1, 1, ErrorCall.class, !IS_TRANSIENT, !IS_VOLATILE,
 				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(errorVariableDeclarationEClass, ErrorVariableDeclaration.class,
-				"ErrorVariableDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(errorVariableDeclarationEClass, ErrorVariableDeclaration.class, "ErrorVariableDeclaration",
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(errorStringLiteralEClass, ErrorStringLiteral.class, "ErrorStringLiteral", !IS_ABSTRACT,
 				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1328,26 +1466,26 @@
 
 		initEClass(bindingEClass, Binding.class, "Binding", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBinding_Name(), theEcorePackage.getEString(), "name", null, 1, 1, Binding.class,
+		initEAttribute(getBinding_Name(), ecorePackage.getEString(), "name", null, 1, 1, Binding.class,
 				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
 				IS_ORDERED);
 		initEReference(getBinding_Type(), this.getTypeLiteral(), null, "type", null, 0, 1, Binding.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getBinding_Value(), this.getExpression(), null, "value", null, 1, 1, Binding.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(errorBindingEClass, ErrorBinding.class, "ErrorBinding", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(letEClass, Let.class, "Let", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getLet_Bindings(), this.getBinding(), null, "bindings", null, 1, -1, Let.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getLet_Body(), this.getExpression(), null, "body", null, 1, 1, Let.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(conditionalEClass, Conditional.class, "Conditional", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
@@ -1375,7 +1513,7 @@
 		addEEnumLiteral(callTypeEEnum, CallType.COLLECTIONCALL);
 
 		// Initialize data types
-		initEDataType(objectTypeEDataType, Object.class, "ObjectType", IS_SERIALIZABLE,
+		initEDataType(javaClassEDataType, Class.class, "JavaClass", IS_SERIALIZABLE,
 				!IS_GENERATED_INSTANCE_CLASS);
 
 		// Create resource
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/BindingImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/BindingImpl.java
index 5eda2fa..b63053e 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/BindingImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/BindingImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -100,6 +100,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -109,6 +110,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -121,6 +123,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public TypeLiteral getType() {
 		return type;
 	}
@@ -149,6 +152,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setType(TypeLiteral newType) {
 		if (newType != type) {
 			NotificationChain msgs = null;
@@ -162,7 +166,8 @@
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.BINDING__TYPE, newType, newType));
+			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.BINDING__TYPE, newType,
+					newType));
 	}
 
 	/**
@@ -170,6 +175,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Expression getValue() {
 		return value;
 	}
@@ -198,6 +204,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setValue(Expression newValue) {
 		if (newValue != value) {
 			NotificationChain msgs = null;
@@ -319,7 +326,7 @@
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(')');
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/BooleanLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/BooleanLiteralImpl.java
index bbe1baa..99d7371 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/BooleanLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/BooleanLiteralImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -21,10 +21,10 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.BooleanLiteralImpl#isValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -73,6 +73,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public boolean isValue() {
 		return value;
 	}
@@ -82,12 +83,13 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setValue(boolean newValue) {
 		boolean oldValue = value;
 		value = newValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.BOOLEAN_LITERAL__VALUE,
-					oldValue, value));
+			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.BOOLEAN_LITERAL__VALUE, oldValue,
+					value));
 	}
 
 	/**
@@ -158,7 +160,7 @@
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/CallImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/CallImpl.java
index 1dc7018..becec33 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/CallImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/CallImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -29,12 +29,12 @@
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Call</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.CallImpl#getServiceName <em>Service Name</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.CallImpl#getType <em>Type</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.CallImpl#getArguments <em>Arguments</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -113,6 +113,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public String getServiceName() {
 		return serviceName;
 	}
@@ -122,6 +123,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setServiceName(String newServiceName) {
 		String oldServiceName = serviceName;
 		serviceName = newServiceName;
@@ -135,6 +137,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public CallType getType() {
 		return type;
 	}
@@ -144,6 +147,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setType(CallType newType) {
 		CallType oldType = type;
 		type = newType == null ? TYPE_EDEFAULT : newType;
@@ -156,6 +160,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EList<Expression> getArguments() {
 		if (arguments == null) {
 			arguments = new EObjectContainmentEList<Expression>(Expression.class, this,
@@ -249,8 +254,8 @@
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
 			case AstPackage.CALL__SERVICE_NAME:
-				return SERVICE_NAME_EDEFAULT == null ? serviceName != null : !SERVICE_NAME_EDEFAULT
-						.equals(serviceName);
+				return SERVICE_NAME_EDEFAULT == null ? serviceName != null
+						: !SERVICE_NAME_EDEFAULT.equals(serviceName);
 			case AstPackage.CALL__TYPE:
 				return type != TYPE_EDEFAULT;
 			case AstPackage.CALL__ARGUMENTS:
@@ -269,7 +274,7 @@
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (serviceName: ");
 		result.append(serviceName);
 		result.append(", type: ");
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ClassTypeLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ClassTypeLiteralImpl.java
new file mode 100644
index 0000000..8875ca5
--- /dev/null
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ClassTypeLiteralImpl.java
@@ -0,0 +1,171 @@
+/**
+ *  Copyright (c) 2015, 2021 Obeo.
+ *  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:
+ *      Obeo - initial API and implementation
+ * 
+ */
+package org.eclipse.acceleo.query.ast.impl;
+
+import org.eclipse.acceleo.query.ast.AstPackage;
+import org.eclipse.acceleo.query.ast.ClassTypeLiteral;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Class Type Literal</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.ClassTypeLiteralImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ClassTypeLiteralImpl extends LiteralImpl implements ClassTypeLiteral {
+	/**
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Class VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected Class value = VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected ClassTypeLiteralImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return AstPackage.Literals.CLASS_TYPE_LITERAL;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Class getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void setValue(Class newValue) {
+		Class oldValue = value;
+		value = newValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.CLASS_TYPE_LITERAL__VALUE,
+					oldValue, value));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case AstPackage.CLASS_TYPE_LITERAL__VALUE:
+				return getValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case AstPackage.CLASS_TYPE_LITERAL__VALUE:
+				setValue((Class)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case AstPackage.CLASS_TYPE_LITERAL__VALUE:
+				setValue(VALUE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case AstPackage.CLASS_TYPE_LITERAL__VALUE:
+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (value: ");
+		result.append(value);
+		result.append(')');
+		return result.toString();
+	}
+
+} // ClassTypeLiteralImpl
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/CollectionTypeLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/CollectionTypeLiteralImpl.java
index e05744a..2535e99 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/CollectionTypeLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/CollectionTypeLiteralImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -24,15 +24,15 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.acceleo.query.ast.impl.CollectionTypeLiteralImpl#getElementType <em>Element Type
- * </em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.CollectionTypeLiteralImpl#getElementType <em>Element
+ * Type</em>}</li>
+ * </ul>
  *
  * @generated
  */
-public class CollectionTypeLiteralImpl extends TypeLiteralImpl implements CollectionTypeLiteral {
+public class CollectionTypeLiteralImpl extends ClassTypeLiteralImpl implements CollectionTypeLiteral {
 	/**
 	 * The cached value of the '{@link #getElementType() <em>Element Type</em>}' containment reference. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -67,6 +67,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public TypeLiteral getElementType() {
 		return elementType;
 	}
@@ -95,6 +96,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setElementType(TypeLiteral newElementType) {
 		if (newElementType != elementType) {
 			NotificationChain msgs = null;
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ConditionalImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ConditionalImpl.java
index 571c927..1ade0b7 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ConditionalImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ConditionalImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -25,12 +25,12 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.ConditionalImpl#getPredicate <em>Predicate</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.ConditionalImpl#getTrueBranch <em>True Branch</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.ConditionalImpl#getFalseBranch <em>False Branch</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -89,6 +89,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Expression getPredicate() {
 		return predicate;
 	}
@@ -117,6 +118,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setPredicate(Expression newPredicate) {
 		if (newPredicate != predicate) {
 			NotificationChain msgs = null;
@@ -139,6 +141,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Expression getTrueBranch() {
 		return trueBranch;
 	}
@@ -167,6 +170,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setTrueBranch(Expression newTrueBranch) {
 		if (newTrueBranch != trueBranch) {
 			NotificationChain msgs = null;
@@ -189,6 +193,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Expression getFalseBranch() {
 		return falseBranch;
 	}
@@ -217,6 +222,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setFalseBranch(Expression newFalseBranch) {
 		if (newFalseBranch != falseBranch) {
 			NotificationChain msgs = null;
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/EClassifierTypeLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/EClassifierTypeLiteralImpl.java
new file mode 100644
index 0000000..6861807
--- /dev/null
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/EClassifierTypeLiteralImpl.java
@@ -0,0 +1,233 @@
+/**
+ *  Copyright (c) 2015, 2021 Obeo.
+ *  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:
+ *      Obeo - initial API and implementation
+ * 
+ */
+package org.eclipse.acceleo.query.ast.impl;
+
+import org.eclipse.acceleo.query.ast.AstPackage;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>EClassifier Type Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.EClassifierTypeLiteralImpl#getEPackageName <em>EPackage
+ * Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.EClassifierTypeLiteralImpl#getEClassifierName <em>EClassifier
+ * Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EClassifierTypeLiteralImpl extends LiteralImpl implements EClassifierTypeLiteral {
+	/**
+	 * The default value of the '{@link #getEPackageName() <em>EPackage Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEPackageName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EPACKAGE_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getEPackageName() <em>EPackage Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEPackageName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String ePackageName = EPACKAGE_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getEClassifierName() <em>EClassifier Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEClassifierName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ECLASSIFIER_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getEClassifierName() <em>EClassifier Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEClassifierName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String eClassifierName = ECLASSIFIER_NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected EClassifierTypeLiteralImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return AstPackage.Literals.ECLASSIFIER_TYPE_LITERAL;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String getEPackageName() {
+		return ePackageName;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void setEPackageName(String newEPackageName) {
+		String oldEPackageName = ePackageName;
+		ePackageName = newEPackageName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					AstPackage.ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME, oldEPackageName, ePackageName));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String getEClassifierName() {
+		return eClassifierName;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void setEClassifierName(String newEClassifierName) {
+		String oldEClassifierName = eClassifierName;
+		eClassifierName = newEClassifierName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					AstPackage.ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME, oldEClassifierName,
+					eClassifierName));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case AstPackage.ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME:
+				return getEPackageName();
+			case AstPackage.ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME:
+				return getEClassifierName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case AstPackage.ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME:
+				setEPackageName((String)newValue);
+				return;
+			case AstPackage.ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME:
+				setEClassifierName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case AstPackage.ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME:
+				setEPackageName(EPACKAGE_NAME_EDEFAULT);
+				return;
+			case AstPackage.ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME:
+				setEClassifierName(ECLASSIFIER_NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case AstPackage.ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME:
+				return EPACKAGE_NAME_EDEFAULT == null ? ePackageName != null
+						: !EPACKAGE_NAME_EDEFAULT.equals(ePackageName);
+			case AstPackage.ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME:
+				return ECLASSIFIER_NAME_EDEFAULT == null ? eClassifierName != null
+						: !ECLASSIFIER_NAME_EDEFAULT.equals(eClassifierName);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (ePackageName: ");
+		result.append(ePackageName);
+		result.append(", eClassifierName: ");
+		result.append(eClassifierName);
+		result.append(')');
+		return result.toString();
+	}
+
+} // EClassifierTypeLiteralImpl
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/EnumLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/EnumLiteralImpl.java
index afde959..783f0f1 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/EnumLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/EnumLiteralImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -14,8 +14,6 @@
 import org.eclipse.acceleo.query.ast.EnumLiteral;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
@@ -23,23 +21,76 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.acceleo.query.ast.impl.EnumLiteralImpl#getLiteral <em>Literal</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.EnumLiteralImpl#getEPackageName <em>EPackage Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.EnumLiteralImpl#getEEnumName <em>EEnum Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.EnumLiteralImpl#getEEnumLiteralName <em>EEnum Literal
+ * Name</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class EnumLiteralImpl extends LiteralImpl implements EnumLiteral {
 	/**
-	 * The cached value of the '{@link #getLiteral() <em>Literal</em>}' reference. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getEPackageName() <em>EPackage Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see #getLiteral()
+	 * @see #getEPackageName()
 	 * @generated
 	 * @ordered
 	 */
-	protected EEnumLiteral literal;
+	protected static final String EPACKAGE_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getEPackageName() <em>EPackage Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEPackageName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String ePackageName = EPACKAGE_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getEEnumName() <em>EEnum Name</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEEnumName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EENUM_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getEEnumName() <em>EEnum Name</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEEnumName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String eEnumName = EENUM_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getEEnumLiteralName() <em>EEnum Literal Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEEnumLiteralName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EENUM_LITERAL_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getEEnumLiteralName() <em>EEnum Literal Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEEnumLiteralName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String eEnumLiteralName = EENUM_LITERAL_NAME_EDEFAULT;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -65,17 +116,9 @@
 	 * 
 	 * @generated
 	 */
-	public EEnumLiteral getLiteral() {
-		if (literal != null && literal.eIsProxy()) {
-			InternalEObject oldLiteral = (InternalEObject)literal;
-			literal = (EEnumLiteral)eResolveProxy(oldLiteral);
-			if (literal != oldLiteral) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							AstPackage.ENUM_LITERAL__LITERAL, oldLiteral, literal));
-			}
-		}
-		return literal;
+	@Override
+	public String getEPackageName() {
+		return ePackageName;
 	}
 
 	/**
@@ -83,21 +126,61 @@
 	 * 
 	 * @generated
 	 */
-	public EEnumLiteral basicGetLiteral() {
-		return literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setLiteral(EEnumLiteral newLiteral) {
-		EEnumLiteral oldLiteral = literal;
-		literal = newLiteral;
+	@Override
+	public void setEPackageName(String newEPackageName) {
+		String oldEPackageName = ePackageName;
+		ePackageName = newEPackageName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.ENUM_LITERAL__LITERAL,
-					oldLiteral, literal));
+			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.ENUM_LITERAL__EPACKAGE_NAME,
+					oldEPackageName, ePackageName));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String getEEnumName() {
+		return eEnumName;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void setEEnumName(String newEEnumName) {
+		String oldEEnumName = eEnumName;
+		eEnumName = newEEnumName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.ENUM_LITERAL__EENUM_NAME,
+					oldEEnumName, eEnumName));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String getEEnumLiteralName() {
+		return eEnumLiteralName;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void setEEnumLiteralName(String newEEnumLiteralName) {
+		String oldEEnumLiteralName = eEnumLiteralName;
+		eEnumLiteralName = newEEnumLiteralName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.ENUM_LITERAL__EENUM_LITERAL_NAME,
+					oldEEnumLiteralName, eEnumLiteralName));
 	}
 
 	/**
@@ -108,10 +191,12 @@
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case AstPackage.ENUM_LITERAL__LITERAL:
-				if (resolve)
-					return getLiteral();
-				return basicGetLiteral();
+			case AstPackage.ENUM_LITERAL__EPACKAGE_NAME:
+				return getEPackageName();
+			case AstPackage.ENUM_LITERAL__EENUM_NAME:
+				return getEEnumName();
+			case AstPackage.ENUM_LITERAL__EENUM_LITERAL_NAME:
+				return getEEnumLiteralName();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -124,8 +209,14 @@
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case AstPackage.ENUM_LITERAL__LITERAL:
-				setLiteral((EEnumLiteral)newValue);
+			case AstPackage.ENUM_LITERAL__EPACKAGE_NAME:
+				setEPackageName((String)newValue);
+				return;
+			case AstPackage.ENUM_LITERAL__EENUM_NAME:
+				setEEnumName((String)newValue);
+				return;
+			case AstPackage.ENUM_LITERAL__EENUM_LITERAL_NAME:
+				setEEnumLiteralName((String)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -139,8 +230,14 @@
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case AstPackage.ENUM_LITERAL__LITERAL:
-				setLiteral((EEnumLiteral)null);
+			case AstPackage.ENUM_LITERAL__EPACKAGE_NAME:
+				setEPackageName(EPACKAGE_NAME_EDEFAULT);
+				return;
+			case AstPackage.ENUM_LITERAL__EENUM_NAME:
+				setEEnumName(EENUM_NAME_EDEFAULT);
+				return;
+			case AstPackage.ENUM_LITERAL__EENUM_LITERAL_NAME:
+				setEEnumLiteralName(EENUM_LITERAL_NAME_EDEFAULT);
 				return;
 		}
 		super.eUnset(featureID);
@@ -154,10 +251,38 @@
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case AstPackage.ENUM_LITERAL__LITERAL:
-				return literal != null;
+			case AstPackage.ENUM_LITERAL__EPACKAGE_NAME:
+				return EPACKAGE_NAME_EDEFAULT == null ? ePackageName != null
+						: !EPACKAGE_NAME_EDEFAULT.equals(ePackageName);
+			case AstPackage.ENUM_LITERAL__EENUM_NAME:
+				return EENUM_NAME_EDEFAULT == null ? eEnumName != null
+						: !EENUM_NAME_EDEFAULT.equals(eEnumName);
+			case AstPackage.ENUM_LITERAL__EENUM_LITERAL_NAME:
+				return EENUM_LITERAL_NAME_EDEFAULT == null ? eEnumLiteralName != null
+						: !EENUM_LITERAL_NAME_EDEFAULT.equals(eEnumLiteralName);
 		}
 		return super.eIsSet(featureID);
 	}
 
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (ePackageName: ");
+		result.append(ePackageName);
+		result.append(", eEnumName: ");
+		result.append(eEnumName);
+		result.append(", eEnumLiteralName: ");
+		result.append(eEnumLiteralName);
+		result.append(')');
+		return result.toString();
+	}
+
 } // EnumLiteralImpl
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorBindingImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorBindingImpl.java
index 8b20b0b..2e2ac48 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorBindingImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorBindingImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -27,12 +27,12 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorBindingImpl#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorBindingImpl#getType <em>Type</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorBindingImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -101,6 +101,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -110,6 +111,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -123,6 +125,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public TypeLiteral getType() {
 		return type;
 	}
@@ -151,6 +154,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setType(TypeLiteral newType) {
 		if (newType != type) {
 			NotificationChain msgs = null;
@@ -173,6 +177,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Expression getValue() {
 		return value;
 	}
@@ -201,6 +206,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setValue(Expression newValue) {
 		if (newValue != value) {
 			NotificationChain msgs = null;
@@ -366,7 +372,7 @@
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(')');
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorCallImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorCallImpl.java
index 538f4a3..5316b57 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorCallImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorCallImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -31,6 +31,7 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorCallImpl#getServiceName <em>Service Name</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorCallImpl#getType <em>Type</em>}</li>
@@ -38,7 +39,6 @@
  * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorCallImpl#isMissingEndParenthesis <em>Missing End
  * Parenthesis</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -137,6 +137,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public String getServiceName() {
 		return serviceName;
 	}
@@ -146,6 +147,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setServiceName(String newServiceName) {
 		String oldServiceName = serviceName;
 		serviceName = newServiceName;
@@ -159,6 +161,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public CallType getType() {
 		return type;
 	}
@@ -168,11 +171,13 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setType(CallType newType) {
 		CallType oldType = type;
 		type = newType == null ? TYPE_EDEFAULT : newType;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.ERROR_CALL__TYPE, oldType, type));
+			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.ERROR_CALL__TYPE, oldType,
+					type));
 	}
 
 	/**
@@ -180,6 +185,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EList<Expression> getArguments() {
 		if (arguments == null) {
 			arguments = new EObjectContainmentEList<Expression>(Expression.class, this,
@@ -193,6 +199,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public boolean isMissingEndParenthesis() {
 		return missingEndParenthesis;
 	}
@@ -202,6 +209,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setMissingEndParenthesis(boolean newMissingEndParenthesis) {
 		boolean oldMissingEndParenthesis = missingEndParenthesis;
 		missingEndParenthesis = newMissingEndParenthesis;
@@ -304,8 +312,8 @@
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
 			case AstPackage.ERROR_CALL__SERVICE_NAME:
-				return SERVICE_NAME_EDEFAULT == null ? serviceName != null : !SERVICE_NAME_EDEFAULT
-						.equals(serviceName);
+				return SERVICE_NAME_EDEFAULT == null ? serviceName != null
+						: !SERVICE_NAME_EDEFAULT.equals(serviceName);
 			case AstPackage.ERROR_CALL__TYPE:
 				return type != TYPE_EDEFAULT;
 			case AstPackage.ERROR_CALL__ARGUMENTS:
@@ -370,7 +378,7 @@
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (serviceName: ");
 		result.append(serviceName);
 		result.append(", type: ");
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorConditionalImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorConditionalImpl.java
index 5373a38..a3a2368 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorConditionalImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorConditionalImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -26,12 +26,13 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorConditionalImpl#getPredicate <em>Predicate</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorConditionalImpl#getTrueBranch <em>True Branch</em>}</li>
- * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorConditionalImpl#getFalseBranch <em>False Branch</em>}</li>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorConditionalImpl#getFalseBranch <em>False
+ * Branch</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -90,6 +91,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Expression getPredicate() {
 		return predicate;
 	}
@@ -118,6 +120,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setPredicate(Expression newPredicate) {
 		if (newPredicate != predicate) {
 			NotificationChain msgs = null;
@@ -140,6 +143,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Expression getTrueBranch() {
 		return trueBranch;
 	}
@@ -168,6 +172,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setTrueBranch(Expression newTrueBranch) {
 		if (newTrueBranch != trueBranch) {
 			NotificationChain msgs = null;
@@ -190,6 +195,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Expression getFalseBranch() {
 		return falseBranch;
 	}
@@ -218,6 +224,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setFalseBranch(Expression newFalseBranch) {
 		if (newFalseBranch != falseBranch) {
 			NotificationChain msgs = null;
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorEClassifierTypeLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorEClassifierTypeLiteralImpl.java
index e079d0e..33c9c72 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorEClassifierTypeLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorEClassifierTypeLiteralImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -12,18 +12,92 @@
 package org.eclipse.acceleo.query.ast.impl;
 
 import org.eclipse.acceleo.query.ast.AstPackage;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
 import org.eclipse.acceleo.query.ast.ErrorEClassifierTypeLiteral;
+import org.eclipse.acceleo.query.ast.Literal;
+import org.eclipse.acceleo.query.ast.TypeLiteral;
+import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Error EClassifier Type Literal</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Error EClassifier Type
+ * Literal</b></em>'. <!-- end-user-doc -->
  * <p>
+ * The following features are implemented:
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorEClassifierTypeLiteralImpl#getEPackageName <em>EPackage
+ * Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorEClassifierTypeLiteralImpl#getEClassifierName
+ * <em>EClassifier Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorEClassifierTypeLiteralImpl#isMissingColon <em>Missing
+ * Colon</em>}</li>
+ * </ul>
  *
  * @generated
  */
-public class ErrorEClassifierTypeLiteralImpl extends ErrorTypeLiteralImpl implements ErrorEClassifierTypeLiteral {
+public class ErrorEClassifierTypeLiteralImpl extends ExpressionImpl implements ErrorEClassifierTypeLiteral {
+	/**
+	 * The default value of the '{@link #getEPackageName() <em>EPackage Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEPackageName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EPACKAGE_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getEPackageName() <em>EPackage Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEPackageName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String ePackageName = EPACKAGE_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getEClassifierName() <em>EClassifier Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEClassifierName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ECLASSIFIER_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getEClassifierName() <em>EClassifier Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEClassifierName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String eClassifierName = ECLASSIFIER_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isMissingColon() <em>Missing Colon</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #isMissingColon()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean MISSING_COLON_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isMissingColon() <em>Missing Colon</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #isMissingColon()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean missingColon = MISSING_COLON_EDEFAULT;
+
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -43,4 +117,242 @@
 		return AstPackage.Literals.ERROR_ECLASSIFIER_TYPE_LITERAL;
 	}
 
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String getEPackageName() {
+		return ePackageName;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void setEPackageName(String newEPackageName) {
+		String oldEPackageName = ePackageName;
+		ePackageName = newEPackageName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME, oldEPackageName, ePackageName));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String getEClassifierName() {
+		return eClassifierName;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void setEClassifierName(String newEClassifierName) {
+		String oldEClassifierName = eClassifierName;
+		eClassifierName = newEClassifierName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME, oldEClassifierName,
+					eClassifierName));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public boolean isMissingColon() {
+		return missingColon;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void setMissingColon(boolean newMissingColon) {
+		boolean oldMissingColon = missingColon;
+		missingColon = newMissingColon;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__MISSING_COLON, oldMissingColon, missingColon));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME:
+				return getEPackageName();
+			case AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME:
+				return getEClassifierName();
+			case AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__MISSING_COLON:
+				return isMissingColon();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME:
+				setEPackageName((String)newValue);
+				return;
+			case AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME:
+				setEClassifierName((String)newValue);
+				return;
+			case AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__MISSING_COLON:
+				setMissingColon((Boolean)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME:
+				setEPackageName(EPACKAGE_NAME_EDEFAULT);
+				return;
+			case AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME:
+				setEClassifierName(ECLASSIFIER_NAME_EDEFAULT);
+				return;
+			case AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__MISSING_COLON:
+				setMissingColon(MISSING_COLON_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME:
+				return EPACKAGE_NAME_EDEFAULT == null ? ePackageName != null
+						: !EPACKAGE_NAME_EDEFAULT.equals(ePackageName);
+			case AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME:
+				return ECLASSIFIER_NAME_EDEFAULT == null ? eClassifierName != null
+						: !ECLASSIFIER_NAME_EDEFAULT.equals(eClassifierName);
+			case AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__MISSING_COLON:
+				return missingColon != MISSING_COLON_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == Literal.class) {
+			switch (derivedFeatureID) {
+				default:
+					return -1;
+			}
+		}
+		if (baseClass == TypeLiteral.class) {
+			switch (derivedFeatureID) {
+				default:
+					return -1;
+			}
+		}
+		if (baseClass == EClassifierTypeLiteral.class) {
+			switch (derivedFeatureID) {
+				case AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME:
+					return AstPackage.ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME;
+				case AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME:
+					return AstPackage.ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME;
+				default:
+					return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == Literal.class) {
+			switch (baseFeatureID) {
+				default:
+					return -1;
+			}
+		}
+		if (baseClass == TypeLiteral.class) {
+			switch (baseFeatureID) {
+				default:
+					return -1;
+			}
+		}
+		if (baseClass == EClassifierTypeLiteral.class) {
+			switch (baseFeatureID) {
+				case AstPackage.ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME:
+					return AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__EPACKAGE_NAME;
+				case AstPackage.ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME:
+					return AstPackage.ERROR_ECLASSIFIER_TYPE_LITERAL__ECLASSIFIER_NAME;
+				default:
+					return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (ePackageName: ");
+		result.append(ePackageName);
+		result.append(", eClassifierName: ");
+		result.append(eClassifierName);
+		result.append(", missingColon: ");
+		result.append(missingColon);
+		result.append(')');
+		return result.toString();
+	}
+
 } // ErrorEClassifierTypeLiteralImpl
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorEnumLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorEnumLiteralImpl.java
index 9ccb99b..c277ed1 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorEnumLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorEnumLiteralImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -11,54 +11,92 @@
  */
 package org.eclipse.acceleo.query.ast.impl;
 
-import java.util.Collection;
-
 import org.eclipse.acceleo.query.ast.AstPackage;
 import org.eclipse.acceleo.query.ast.EnumLiteral;
 import org.eclipse.acceleo.query.ast.ErrorEnumLiteral;
 import org.eclipse.acceleo.query.ast.Literal;
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Enum Literal</b></em>'. <!--
  * end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorEnumLiteralImpl#getLiteral <em>Literal</em>}</li>
- * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorEnumLiteralImpl#getSegments <em>Segments</em>}</li>
- * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorEnumLiteralImpl#isMissingColon <em>Missing Colon</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorEnumLiteralImpl#getEPackageName <em>EPackage
+ * Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorEnumLiteralImpl#getEEnumName <em>EEnum Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorEnumLiteralImpl#getEEnumLiteralName <em>EEnum Literal
+ * Name</em>}</li>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorEnumLiteralImpl#isMissingColon <em>Missing
+ * Colon</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class ErrorEnumLiteralImpl extends ExpressionImpl implements ErrorEnumLiteral {
 	/**
-	 * The cached value of the '{@link #getLiteral() <em>Literal</em>}' reference. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The default value of the '{@link #getEPackageName() <em>EPackage Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see #getLiteral()
+	 * @see #getEPackageName()
 	 * @generated
 	 * @ordered
 	 */
-	protected EEnumLiteral literal;
+	protected static final String EPACKAGE_NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getSegments() <em>Segments</em>}' attribute list. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
+	 * The cached value of the '{@link #getEPackageName() <em>EPackage Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see #getSegments()
+	 * @see #getEPackageName()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<String> segments;
+	protected String ePackageName = EPACKAGE_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getEEnumName() <em>EEnum Name</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEEnumName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EENUM_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getEEnumName() <em>EEnum Name</em>}' attribute. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEEnumName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String eEnumName = EENUM_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getEEnumLiteralName() <em>EEnum Literal Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEEnumLiteralName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EENUM_LITERAL_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getEEnumLiteralName() <em>EEnum Literal Name</em>}' attribute. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see #getEEnumLiteralName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String eEnumLiteralName = EENUM_LITERAL_NAME_EDEFAULT;
 
 	/**
 	 * The default value of the '{@link #isMissingColon() <em>Missing Colon</em>}' attribute. <!--
@@ -104,17 +142,9 @@
 	 * 
 	 * @generated
 	 */
-	public EEnumLiteral getLiteral() {
-		if (literal != null && literal.eIsProxy()) {
-			InternalEObject oldLiteral = (InternalEObject)literal;
-			literal = (EEnumLiteral)eResolveProxy(oldLiteral);
-			if (literal != oldLiteral) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							AstPackage.ERROR_ENUM_LITERAL__LITERAL, oldLiteral, literal));
-			}
-		}
-		return literal;
+	@Override
+	public String getEPackageName() {
+		return ePackageName;
 	}
 
 	/**
@@ -122,21 +152,13 @@
 	 * 
 	 * @generated
 	 */
-	public EEnumLiteral basicGetLiteral() {
-		return literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setLiteral(EEnumLiteral newLiteral) {
-		EEnumLiteral oldLiteral = literal;
-		literal = newLiteral;
+	@Override
+	public void setEPackageName(String newEPackageName) {
+		String oldEPackageName = ePackageName;
+		ePackageName = newEPackageName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.ERROR_ENUM_LITERAL__LITERAL,
-					oldLiteral, literal));
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					AstPackage.ERROR_ENUM_LITERAL__EPACKAGE_NAME, oldEPackageName, ePackageName));
 	}
 
 	/**
@@ -144,12 +166,9 @@
 	 * 
 	 * @generated
 	 */
-	public EList<String> getSegments() {
-		if (segments == null) {
-			segments = new EDataTypeUniqueEList<String>(String.class, this,
-					AstPackage.ERROR_ENUM_LITERAL__SEGMENTS);
-		}
-		return segments;
+	@Override
+	public String getEEnumName() {
+		return eEnumName;
 	}
 
 	/**
@@ -157,6 +176,46 @@
 	 * 
 	 * @generated
 	 */
+	@Override
+	public void setEEnumName(String newEEnumName) {
+		String oldEEnumName = eEnumName;
+		eEnumName = newEEnumName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.ERROR_ENUM_LITERAL__EENUM_NAME,
+					oldEEnumName, eEnumName));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String getEEnumLiteralName() {
+		return eEnumLiteralName;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void setEEnumLiteralName(String newEEnumLiteralName) {
+		String oldEEnumLiteralName = eEnumLiteralName;
+		eEnumLiteralName = newEEnumLiteralName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					AstPackage.ERROR_ENUM_LITERAL__EENUM_LITERAL_NAME, oldEEnumLiteralName,
+					eEnumLiteralName));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
 	public boolean isMissingColon() {
 		return missingColon;
 	}
@@ -166,6 +225,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setMissingColon(boolean newMissingColon) {
 		boolean oldMissingColon = missingColon;
 		missingColon = newMissingColon;
@@ -182,12 +242,12 @@
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case AstPackage.ERROR_ENUM_LITERAL__LITERAL:
-				if (resolve)
-					return getLiteral();
-				return basicGetLiteral();
-			case AstPackage.ERROR_ENUM_LITERAL__SEGMENTS:
-				return getSegments();
+			case AstPackage.ERROR_ENUM_LITERAL__EPACKAGE_NAME:
+				return getEPackageName();
+			case AstPackage.ERROR_ENUM_LITERAL__EENUM_NAME:
+				return getEEnumName();
+			case AstPackage.ERROR_ENUM_LITERAL__EENUM_LITERAL_NAME:
+				return getEEnumLiteralName();
 			case AstPackage.ERROR_ENUM_LITERAL__MISSING_COLON:
 				return isMissingColon();
 		}
@@ -203,12 +263,14 @@
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case AstPackage.ERROR_ENUM_LITERAL__LITERAL:
-				setLiteral((EEnumLiteral)newValue);
+			case AstPackage.ERROR_ENUM_LITERAL__EPACKAGE_NAME:
+				setEPackageName((String)newValue);
 				return;
-			case AstPackage.ERROR_ENUM_LITERAL__SEGMENTS:
-				getSegments().clear();
-				getSegments().addAll((Collection<? extends String>)newValue);
+			case AstPackage.ERROR_ENUM_LITERAL__EENUM_NAME:
+				setEEnumName((String)newValue);
+				return;
+			case AstPackage.ERROR_ENUM_LITERAL__EENUM_LITERAL_NAME:
+				setEEnumLiteralName((String)newValue);
 				return;
 			case AstPackage.ERROR_ENUM_LITERAL__MISSING_COLON:
 				setMissingColon((Boolean)newValue);
@@ -225,11 +287,14 @@
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case AstPackage.ERROR_ENUM_LITERAL__LITERAL:
-				setLiteral((EEnumLiteral)null);
+			case AstPackage.ERROR_ENUM_LITERAL__EPACKAGE_NAME:
+				setEPackageName(EPACKAGE_NAME_EDEFAULT);
 				return;
-			case AstPackage.ERROR_ENUM_LITERAL__SEGMENTS:
-				getSegments().clear();
+			case AstPackage.ERROR_ENUM_LITERAL__EENUM_NAME:
+				setEEnumName(EENUM_NAME_EDEFAULT);
+				return;
+			case AstPackage.ERROR_ENUM_LITERAL__EENUM_LITERAL_NAME:
+				setEEnumLiteralName(EENUM_LITERAL_NAME_EDEFAULT);
 				return;
 			case AstPackage.ERROR_ENUM_LITERAL__MISSING_COLON:
 				setMissingColon(MISSING_COLON_EDEFAULT);
@@ -246,10 +311,15 @@
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case AstPackage.ERROR_ENUM_LITERAL__LITERAL:
-				return literal != null;
-			case AstPackage.ERROR_ENUM_LITERAL__SEGMENTS:
-				return segments != null && !segments.isEmpty();
+			case AstPackage.ERROR_ENUM_LITERAL__EPACKAGE_NAME:
+				return EPACKAGE_NAME_EDEFAULT == null ? ePackageName != null
+						: !EPACKAGE_NAME_EDEFAULT.equals(ePackageName);
+			case AstPackage.ERROR_ENUM_LITERAL__EENUM_NAME:
+				return EENUM_NAME_EDEFAULT == null ? eEnumName != null
+						: !EENUM_NAME_EDEFAULT.equals(eEnumName);
+			case AstPackage.ERROR_ENUM_LITERAL__EENUM_LITERAL_NAME:
+				return EENUM_LITERAL_NAME_EDEFAULT == null ? eEnumLiteralName != null
+						: !EENUM_LITERAL_NAME_EDEFAULT.equals(eEnumLiteralName);
 			case AstPackage.ERROR_ENUM_LITERAL__MISSING_COLON:
 				return missingColon != MISSING_COLON_EDEFAULT;
 		}
@@ -271,8 +341,12 @@
 		}
 		if (baseClass == EnumLiteral.class) {
 			switch (derivedFeatureID) {
-				case AstPackage.ERROR_ENUM_LITERAL__LITERAL:
-					return AstPackage.ENUM_LITERAL__LITERAL;
+				case AstPackage.ERROR_ENUM_LITERAL__EPACKAGE_NAME:
+					return AstPackage.ENUM_LITERAL__EPACKAGE_NAME;
+				case AstPackage.ERROR_ENUM_LITERAL__EENUM_NAME:
+					return AstPackage.ENUM_LITERAL__EENUM_NAME;
+				case AstPackage.ERROR_ENUM_LITERAL__EENUM_LITERAL_NAME:
+					return AstPackage.ENUM_LITERAL__EENUM_LITERAL_NAME;
 				default:
 					return -1;
 			}
@@ -295,8 +369,12 @@
 		}
 		if (baseClass == EnumLiteral.class) {
 			switch (baseFeatureID) {
-				case AstPackage.ENUM_LITERAL__LITERAL:
-					return AstPackage.ERROR_ENUM_LITERAL__LITERAL;
+				case AstPackage.ENUM_LITERAL__EPACKAGE_NAME:
+					return AstPackage.ERROR_ENUM_LITERAL__EPACKAGE_NAME;
+				case AstPackage.ENUM_LITERAL__EENUM_NAME:
+					return AstPackage.ERROR_ENUM_LITERAL__EENUM_NAME;
+				case AstPackage.ENUM_LITERAL__EENUM_LITERAL_NAME:
+					return AstPackage.ERROR_ENUM_LITERAL__EENUM_LITERAL_NAME;
 				default:
 					return -1;
 			}
@@ -314,9 +392,13 @@
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (segments: ");
-		result.append(segments);
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (ePackageName: ");
+		result.append(ePackageName);
+		result.append(", eEnumName: ");
+		result.append(eEnumName);
+		result.append(", eEnumLiteralName: ");
+		result.append(eEnumLiteralName);
 		result.append(", missingColon: ");
 		result.append(missingColon);
 		result.append(')');
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorExpressionImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorExpressionImpl.java
index 9400b02..fde5bab 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorExpressionImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorExpressionImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -17,8 +17,6 @@
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Expression</b></em>'. <!--
  * end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorStringLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorStringLiteralImpl.java
index 836d50d..e10a837 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorStringLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorStringLiteralImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -24,10 +24,10 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorStringLiteralImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -76,6 +76,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public String getValue() {
 		return value;
 	}
@@ -85,6 +86,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setValue(String newValue) {
 		String oldValue = value;
 		value = newValue;
@@ -209,7 +211,7 @@
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorTypeLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorTypeLiteralImpl.java
index f4e1f20..16f8c15 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorTypeLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorTypeLiteralImpl.java
@@ -1,93 +1,28 @@
-/*******************************************************************************
- * Copyright (c) 2015 Obeo.
- * 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
+/**
+ *  Copyright (c) 2015, 2021 Obeo.
+ *  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:
+ *      Obeo - initial API and implementation
  * 
- * Contributors:
- *     Obeo - initial API and implementation
- *******************************************************************************/
+ */
 package org.eclipse.acceleo.query.ast.impl;
 
-import java.util.Collection;
-
 import org.eclipse.acceleo.query.ast.AstPackage;
 import org.eclipse.acceleo.query.ast.ErrorTypeLiteral;
-import org.eclipse.acceleo.query.ast.Literal;
-import org.eclipse.acceleo.query.ast.TypeLiteral;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Error Type Literal</b></em>'. <!--
  * end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorTypeLiteralImpl#getValue <em>Value</em>}</li>
- * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorTypeLiteralImpl#getSegments <em>Segments</em>}</li>
- * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorTypeLiteralImpl#isMissingColon <em>Missing Colon</em>}</li>
- * </ul>
- * </p>
  *
  * @generated
  */
 public class ErrorTypeLiteralImpl extends ExpressionImpl implements ErrorTypeLiteral {
 	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object value = VALUE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getSegments() <em>Segments</em>}' attribute list. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #getSegments()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<String> segments;
-
-	/**
-	 * The default value of the '{@link #isMissingColon() <em>Missing Colon</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #isMissingColon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MISSING_COLON_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMissingColon() <em>Missing Colon</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #isMissingColon()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean missingColon = MISSING_COLON_EDEFAULT;
-
-	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -106,210 +41,4 @@
 		return AstPackage.Literals.ERROR_TYPE_LITERAL;
 	}
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setValue(Object newValue) {
-		Object oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.ERROR_TYPE_LITERAL__VALUE,
-					oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EList<String> getSegments() {
-		if (segments == null) {
-			segments = new EDataTypeUniqueEList<String>(String.class, this,
-					AstPackage.ERROR_TYPE_LITERAL__SEGMENTS);
-		}
-		return segments;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean isMissingColon() {
-		return missingColon;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setMissingColon(boolean newMissingColon) {
-		boolean oldMissingColon = missingColon;
-		missingColon = newMissingColon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					AstPackage.ERROR_TYPE_LITERAL__MISSING_COLON, oldMissingColon, missingColon));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case AstPackage.ERROR_TYPE_LITERAL__VALUE:
-				return getValue();
-			case AstPackage.ERROR_TYPE_LITERAL__SEGMENTS:
-				return getSegments();
-			case AstPackage.ERROR_TYPE_LITERAL__MISSING_COLON:
-				return isMissingColon();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case AstPackage.ERROR_TYPE_LITERAL__VALUE:
-				setValue(newValue);
-				return;
-			case AstPackage.ERROR_TYPE_LITERAL__SEGMENTS:
-				getSegments().clear();
-				getSegments().addAll((Collection<? extends String>)newValue);
-				return;
-			case AstPackage.ERROR_TYPE_LITERAL__MISSING_COLON:
-				setMissingColon((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case AstPackage.ERROR_TYPE_LITERAL__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case AstPackage.ERROR_TYPE_LITERAL__SEGMENTS:
-				getSegments().clear();
-				return;
-			case AstPackage.ERROR_TYPE_LITERAL__MISSING_COLON:
-				setMissingColon(MISSING_COLON_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case AstPackage.ERROR_TYPE_LITERAL__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case AstPackage.ERROR_TYPE_LITERAL__SEGMENTS:
-				return segments != null && !segments.isEmpty();
-			case AstPackage.ERROR_TYPE_LITERAL__MISSING_COLON:
-				return missingColon != MISSING_COLON_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == Literal.class) {
-			switch (derivedFeatureID) {
-				default:
-					return -1;
-			}
-		}
-		if (baseClass == TypeLiteral.class) {
-			switch (derivedFeatureID) {
-				case AstPackage.ERROR_TYPE_LITERAL__VALUE:
-					return AstPackage.TYPE_LITERAL__VALUE;
-				default:
-					return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == Literal.class) {
-			switch (baseFeatureID) {
-				default:
-					return -1;
-			}
-		}
-		if (baseClass == TypeLiteral.class) {
-			switch (baseFeatureID) {
-				case AstPackage.TYPE_LITERAL__VALUE:
-					return AstPackage.ERROR_TYPE_LITERAL__VALUE;
-				default:
-					return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(", segments: ");
-		result.append(segments);
-		result.append(", missingColon: ");
-		result.append(missingColon);
-		result.append(')');
-		return result.toString();
-	}
-
 } // ErrorTypeLiteralImpl
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorVariableDeclarationImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorVariableDeclarationImpl.java
index 866fa6e..bdf0db0 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorVariableDeclarationImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ErrorVariableDeclarationImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -27,13 +27,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorVariableDeclarationImpl#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorVariableDeclarationImpl#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorVariableDeclarationImpl#getExpression <em>Expression
- * </em>}</li>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.ErrorVariableDeclarationImpl#getExpression
+ * <em>Expression</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -102,6 +102,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -111,12 +112,13 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					AstPackage.ERROR_VARIABLE_DECLARATION__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.ERROR_VARIABLE_DECLARATION__NAME,
+					oldName, name));
 	}
 
 	/**
@@ -124,6 +126,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public TypeLiteral getType() {
 		return type;
 	}
@@ -152,6 +155,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setType(TypeLiteral newType) {
 		if (newType != type) {
 			NotificationChain msgs = null;
@@ -165,8 +169,8 @@
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					AstPackage.ERROR_VARIABLE_DECLARATION__TYPE, newType, newType));
+			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.ERROR_VARIABLE_DECLARATION__TYPE,
+					newType, newType));
 	}
 
 	/**
@@ -174,6 +178,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Expression getExpression() {
 		if (expression != null && expression.eIsProxy()) {
 			InternalEObject oldExpression = (InternalEObject)expression;
@@ -201,6 +206,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setExpression(Expression newExpression) {
 		Expression oldExpression = expression;
 		expression = newExpression;
@@ -357,7 +363,7 @@
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(')');
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ExpressionImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ExpressionImpl.java
index 35e3b55..b72871a 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ExpressionImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ExpressionImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -18,8 +18,6 @@
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Expression</b></em>'. <!--
  * end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ImpliesImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ImpliesImpl.java
index ac626eb..d12a6a0 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ImpliesImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/ImpliesImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/IntegerLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/IntegerLiteralImpl.java
index 67f2947..ca758ec 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/IntegerLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/IntegerLiteralImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -21,10 +21,10 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.IntegerLiteralImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -73,6 +73,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public int getValue() {
 		return value;
 	}
@@ -82,12 +83,13 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setValue(int newValue) {
 		int oldValue = value;
 		value = newValue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.INTEGER_LITERAL__VALUE,
-					oldValue, value));
+			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.INTEGER_LITERAL__VALUE, oldValue,
+					value));
 	}
 
 	/**
@@ -158,7 +160,7 @@
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/LambdaImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/LambdaImpl.java
index 0bad679..6a765c9 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/LambdaImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/LambdaImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -84,6 +84,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EList<VariableDeclaration> getParameters() {
 		if (parameters == null) {
 			parameters = new EObjectContainmentEList<VariableDeclaration>(VariableDeclaration.class, this,
@@ -97,6 +98,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Expression getExpression() {
 		return expression;
 	}
@@ -125,6 +127,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setExpression(Expression newExpression) {
 		if (newExpression != expression) {
 			NotificationChain msgs = null;
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/LetImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/LetImpl.java
index 38baac2..81a526b 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/LetImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/LetImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -30,11 +30,11 @@
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Let</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.LetImpl#getBindings <em>Bindings</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.LetImpl#getBody <em>Body</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -83,6 +83,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EList<Binding> getBindings() {
 		if (bindings == null) {
 			bindings = new EObjectContainmentEList<Binding>(Binding.class, this, AstPackage.LET__BINDINGS);
@@ -95,6 +96,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Expression getBody() {
 		return body;
 	}
@@ -123,6 +125,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setBody(Expression newBody) {
 		if (newBody != body) {
 			NotificationChain msgs = null;
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/LiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/LiteralImpl.java
index 698b7a1..ff2bf69 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/LiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/LiteralImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/NullLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/NullLiteralImpl.java
index f21021f..febb9b6 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/NullLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/NullLiteralImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -17,8 +17,6 @@
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Null Literal</b></em>'. <!--
  * end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/OrImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/OrImpl.java
index 2ae77dc..a3146c3 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/OrImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/OrImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -17,8 +17,6 @@
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Or</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/RealLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/RealLiteralImpl.java
index 6db0abd..8ed9c36 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/RealLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/RealLiteralImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -21,10 +21,10 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.RealLiteralImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -73,6 +73,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public double getValue() {
 		return value;
 	}
@@ -82,6 +83,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setValue(double newValue) {
 		double oldValue = value;
 		value = newValue;
@@ -158,7 +160,7 @@
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/SequenceInExtensionLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/SequenceInExtensionLiteralImpl.java
index 0cf09c2..2553f9e 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/SequenceInExtensionLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/SequenceInExtensionLiteralImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -27,10 +27,11 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.acceleo.query.ast.impl.SequenceInExtensionLiteralImpl#getValues <em>Values</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.SequenceInExtensionLiteralImpl#getValues
+ * <em>Values</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -69,6 +70,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EList<Expression> getValues() {
 		if (values == null) {
 			values = new EObjectContainmentEList<Expression>(Expression.class, this,
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/SetInExtensionLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/SetInExtensionLiteralImpl.java
index 8eb8628..bc2f0d0 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/SetInExtensionLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/SetInExtensionLiteralImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -27,10 +27,10 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.SetInExtensionLiteralImpl#getValues <em>Values</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -69,6 +69,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EList<Expression> getValues() {
 		if (values == null) {
 			values = new EObjectContainmentEList<Expression>(Expression.class, this,
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/StringLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/StringLiteralImpl.java
index c3284cc..c3c16bc 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/StringLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/StringLiteralImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -21,10 +21,10 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.StringLiteralImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -73,6 +73,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public String getValue() {
 		return value;
 	}
@@ -82,6 +83,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setValue(String newValue) {
 		String oldValue = value;
 		value = newValue;
@@ -158,7 +160,7 @@
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: ");
 		result.append(value);
 		result.append(')');
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/TypeLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/TypeLiteralImpl.java
index 1d72e25..b75be5b 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/TypeLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/TypeLiteralImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -12,44 +12,16 @@
 
 import org.eclipse.acceleo.query.ast.AstPackage;
 import org.eclipse.acceleo.query.ast.TypeLiteral;
-import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Type Literal</b></em>'. <!--
  * end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.acceleo.query.ast.impl.TypeLiteralImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
  *
  * @generated
  */
 public class TypeLiteralImpl extends LiteralImpl implements TypeLiteral {
 	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object value = VALUE_EDEFAULT;
-
-	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -68,101 +40,4 @@
 		return AstPackage.Literals.TYPE_LITERAL;
 	}
 
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Object getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void setValue(Object newValue) {
-		Object oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.TYPE_LITERAL__VALUE, oldValue,
-					value));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case AstPackage.TYPE_LITERAL__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case AstPackage.TYPE_LITERAL__VALUE:
-				setValue(newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case AstPackage.TYPE_LITERAL__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case AstPackage.TYPE_LITERAL__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
 } // TypeLiteralImpl
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/TypeSetLiteralImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/TypeSetLiteralImpl.java
index f80f1e2..49df866 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/TypeSetLiteralImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/TypeSetLiteralImpl.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -28,14 +28,14 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.TypeSetLiteralImpl#getTypes <em>Types</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class TypeSetLiteralImpl extends TypeLiteralImpl implements TypeSetLiteral {
+public class TypeSetLiteralImpl extends ClassTypeLiteralImpl implements TypeSetLiteral {
 	/**
 	 * The cached value of the '{@link #getTypes() <em>Types</em>}' containment reference list. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -70,6 +70,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public EList<TypeLiteral> getTypes() {
 		if (types == null) {
 			types = new EObjectContainmentEList<TypeLiteral>(TypeLiteral.class, this,
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/VarRefImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/VarRefImpl.java
index 5de51e7..702deb1 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/VarRefImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/VarRefImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -73,6 +73,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public String getVariableName() {
 		return variableName;
 	}
@@ -82,6 +83,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setVariableName(String newVariableName) {
 		String oldVariableName = variableName;
 		variableName = newVariableName;
@@ -143,8 +145,8 @@
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
 			case AstPackage.VAR_REF__VARIABLE_NAME:
-				return VARIABLE_NAME_EDEFAULT == null ? variableName != null : !VARIABLE_NAME_EDEFAULT
-						.equals(variableName);
+				return VARIABLE_NAME_EDEFAULT == null ? variableName != null
+						: !VARIABLE_NAME_EDEFAULT.equals(variableName);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -159,7 +161,7 @@
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (variableName: ");
 		result.append(variableName);
 		result.append(')');
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/VariableDeclarationImpl.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/VariableDeclarationImpl.java
index 5dd6cc0..a19af4a 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/VariableDeclarationImpl.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/impl/VariableDeclarationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -26,12 +26,13 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.VariableDeclarationImpl#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.acceleo.query.ast.impl.VariableDeclarationImpl#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.acceleo.query.ast.impl.VariableDeclarationImpl#getExpression <em>Expression</em>}</li>
+ * <li>{@link org.eclipse.acceleo.query.ast.impl.VariableDeclarationImpl#getExpression
+ * <em>Expression</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -100,6 +101,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -109,6 +111,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
@@ -122,6 +125,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public TypeLiteral getType() {
 		return type;
 	}
@@ -150,6 +154,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setType(TypeLiteral newType) {
 		if (newType != type) {
 			NotificationChain msgs = null;
@@ -172,6 +177,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public Expression getExpression() {
 		if (expression != null && expression.eIsProxy()) {
 			InternalEObject oldExpression = (InternalEObject)expression;
@@ -199,12 +205,13 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void setExpression(Expression newExpression) {
 		Expression oldExpression = expression;
 		expression = newExpression;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					AstPackage.VARIABLE_DECLARATION__EXPRESSION, oldExpression, expression));
+			eNotify(new ENotificationImpl(this, Notification.SET, AstPackage.VARIABLE_DECLARATION__EXPRESSION,
+					oldExpression, expression));
 	}
 
 	/**
@@ -311,7 +318,7 @@
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(')');
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/util/AstAdapterFactory.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/util/AstAdapterFactory.java
index 620836d..bbef2a4 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/util/AstAdapterFactory.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/util/AstAdapterFactory.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -16,8 +16,10 @@
 import org.eclipse.acceleo.query.ast.Binding;
 import org.eclipse.acceleo.query.ast.BooleanLiteral;
 import org.eclipse.acceleo.query.ast.Call;
+import org.eclipse.acceleo.query.ast.ClassTypeLiteral;
 import org.eclipse.acceleo.query.ast.CollectionTypeLiteral;
 import org.eclipse.acceleo.query.ast.Conditional;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
 import org.eclipse.acceleo.query.ast.EnumLiteral;
 import org.eclipse.acceleo.query.ast.ErrorBinding;
 import org.eclipse.acceleo.query.ast.ErrorCall;
@@ -152,6 +154,16 @@
 		}
 
 		@Override
+		public Adapter caseEClassifierTypeLiteral(EClassifierTypeLiteral object) {
+			return createEClassifierTypeLiteralAdapter();
+		}
+
+		@Override
+		public Adapter caseClassTypeLiteral(ClassTypeLiteral object) {
+			return createClassTypeLiteralAdapter();
+		}
+
+		@Override
 		public Adapter caseTypeSetLiteral(TypeSetLiteral object) {
 			return createTypeSetLiteralAdapter();
 		}
@@ -300,10 +312,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.VarRef
-	 * <em>Var Ref</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.VarRef <em>Var
+	 * Ref</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.acceleo.query.ast.VarRef
@@ -314,9 +326,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.Call <em>Call</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.Call
+	 * <em>Call</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.acceleo.query.ast.Call
@@ -355,10 +368,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.RealLiteral
-	 * <em>Real Literal</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.RealLiteral <em>Real
+	 * Literal</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.acceleo.query.ast.RealLiteral
@@ -397,10 +410,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.EnumLiteral
-	 * <em>Enum Literal</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.EnumLiteral <em>Enum
+	 * Literal</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.acceleo.query.ast.EnumLiteral
@@ -411,10 +424,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.TypeLiteral
-	 * <em>Type Literal</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.TypeLiteral <em>Type
+	 * Literal</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.acceleo.query.ast.TypeLiteral
@@ -425,6 +438,34 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.acceleo.query.ast.EClassifierTypeLiteral <em>EClassifier Type Literal</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.acceleo.query.ast.EClassifierTypeLiteral
+	 * @generated
+	 */
+	public Adapter createEClassifierTypeLiteralAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.ClassTypeLiteral
+	 * <em>Class Type Literal</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.acceleo.query.ast.ClassTypeLiteral
+	 * @generated
+	 */
+	public Adapter createClassTypeLiteralAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.TypeSetLiteral
 	 * <em>Type Set Literal</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
@@ -467,10 +508,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.NullLiteral
-	 * <em>Null Literal</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.NullLiteral <em>Null
+	 * Literal</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.acceleo.query.ast.NullLiteral
@@ -495,10 +536,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.acceleo.query.ast.SequenceInExtensionLiteral <em>Sequence In Extension Literal</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 -->
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.acceleo.query.ast.SequenceInExtensionLiteral <em>Sequence In Extension
+	 * Literal</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.acceleo.query.ast.SequenceInExtensionLiteral
@@ -524,9 +566,9 @@
 
 	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.Error <em>Error</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 -->
+	 * }'. <!-- 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.acceleo.query.ast.Error
@@ -565,11 +607,11 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.acceleo.query.ast.ErrorEClassifierTypeLiteral
-	 * <em>Error EClassifier Type Literal</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 -->
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.acceleo.query.ast.ErrorEClassifierTypeLiteral <em>Error EClassifier Type
+	 * Literal</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.acceleo.query.ast.ErrorEClassifierTypeLiteral
@@ -594,10 +636,10 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.ErrorCall
-	 * <em>Error Call</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 -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.acceleo.query.ast.ErrorCall <em>Error
+	 * Call</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.acceleo.query.ast.ErrorCall
@@ -608,8 +650,8 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.acceleo.query.ast.ErrorVariableDeclaration <em>Error Variable Declaration</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.acceleo.query.ast.ErrorVariableDeclaration <em>Error Variable Declaration</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 -->
 	 * 
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/util/AstSwitch.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/util/AstSwitch.java
index 289f248..27a5720 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/util/AstSwitch.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/ast/util/AstSwitch.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (c) 2015 Obeo.
+ *  Copyright (c) 2015, 2021 Obeo.
  *  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
@@ -16,8 +16,10 @@
 import org.eclipse.acceleo.query.ast.Binding;
 import org.eclipse.acceleo.query.ast.BooleanLiteral;
 import org.eclipse.acceleo.query.ast.Call;
+import org.eclipse.acceleo.query.ast.ClassTypeLiteral;
 import org.eclipse.acceleo.query.ast.CollectionTypeLiteral;
 import org.eclipse.acceleo.query.ast.Conditional;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
 import org.eclipse.acceleo.query.ast.EnumLiteral;
 import org.eclipse.acceleo.query.ast.ErrorBinding;
 import org.eclipse.acceleo.query.ast.ErrorCall;
@@ -79,7 +81,8 @@
 	/**
 	 * Checks whether this is a switch for the given package. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @parameter ePackage the package in question.
+	 * @param ePackage
+	 *            the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
@@ -198,10 +201,38 @@
 					result = defaultCase(theEObject);
 				return result;
 			}
+			case AstPackage.ECLASSIFIER_TYPE_LITERAL: {
+				EClassifierTypeLiteral eClassifierTypeLiteral = (EClassifierTypeLiteral)theEObject;
+				T result = caseEClassifierTypeLiteral(eClassifierTypeLiteral);
+				if (result == null)
+					result = caseTypeLiteral(eClassifierTypeLiteral);
+				if (result == null)
+					result = caseLiteral(eClassifierTypeLiteral);
+				if (result == null)
+					result = caseExpression(eClassifierTypeLiteral);
+				if (result == null)
+					result = defaultCase(theEObject);
+				return result;
+			}
+			case AstPackage.CLASS_TYPE_LITERAL: {
+				ClassTypeLiteral classTypeLiteral = (ClassTypeLiteral)theEObject;
+				T result = caseClassTypeLiteral(classTypeLiteral);
+				if (result == null)
+					result = caseTypeLiteral(classTypeLiteral);
+				if (result == null)
+					result = caseLiteral(classTypeLiteral);
+				if (result == null)
+					result = caseExpression(classTypeLiteral);
+				if (result == null)
+					result = defaultCase(theEObject);
+				return result;
+			}
 			case AstPackage.TYPE_SET_LITERAL: {
 				TypeSetLiteral typeSetLiteral = (TypeSetLiteral)theEObject;
 				T result = caseTypeSetLiteral(typeSetLiteral);
 				if (result == null)
+					result = caseClassTypeLiteral(typeSetLiteral);
+				if (result == null)
 					result = caseTypeLiteral(typeSetLiteral);
 				if (result == null)
 					result = caseLiteral(typeSetLiteral);
@@ -215,6 +246,8 @@
 				CollectionTypeLiteral collectionTypeLiteral = (CollectionTypeLiteral)theEObject;
 				T result = caseCollectionTypeLiteral(collectionTypeLiteral);
 				if (result == null)
+					result = caseClassTypeLiteral(collectionTypeLiteral);
+				if (result == null)
 					result = caseTypeLiteral(collectionTypeLiteral);
 				if (result == null)
 					result = caseLiteral(collectionTypeLiteral);
@@ -314,10 +347,10 @@
 				ErrorEClassifierTypeLiteral errorEClassifierTypeLiteral = (ErrorEClassifierTypeLiteral)theEObject;
 				T result = caseErrorEClassifierTypeLiteral(errorEClassifierTypeLiteral);
 				if (result == null)
-					result = caseErrorTypeLiteral(errorEClassifierTypeLiteral);
-				if (result == null)
 					result = caseError(errorEClassifierTypeLiteral);
 				if (result == null)
+					result = caseEClassifierTypeLiteral(errorEClassifierTypeLiteral);
+				if (result == null)
 					result = caseTypeLiteral(errorEClassifierTypeLiteral);
 				if (result == null)
 					result = caseLiteral(errorEClassifierTypeLiteral);
@@ -623,6 +656,36 @@
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EClassifier Type Literal</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>EClassifier Type Literal</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEClassifierTypeLiteral(EClassifierTypeLiteral object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Class Type Literal</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>Class Type Literal</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseClassTypeLiteral(ClassTypeLiteral object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Type Set Literal</em>'. <!--
 	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the
 	 * switch. <!-- end-user-doc -->
@@ -698,14 +761,14 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Sequence In Extension Literal</em>
-	 * '. <!-- begin-user-doc --> This implementation returns null; returning a non-null result will terminate
-	 * the switch. <!-- end-user-doc -->
+	 * Returns the result of interpreting the object as an instance of '<em>Sequence In Extension
+	 * Literal</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>Sequence In Extension Literal</em>
-	 *         '.
+	 * @return the result of interpreting the object as an instance of '<em>Sequence In Extension
+	 *         Literal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -774,14 +837,14 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Error EClassifier Type Literal</em>'. <!-- begin-user-doc --> This implementation returns null;
-	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * Returns the result of interpreting the object as an instance of '<em>Error EClassifier Type
+	 * Literal</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>Error EClassifier Type Literal</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Error EClassifier Type
+	 *         Literal</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryBaseListener.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryBaseListener.java
index 551214b..c4ebf57 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryBaseListener.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryBaseListener.java
@@ -11,642 +11,1053 @@
  *     Obeo - initial API and implementation
  *******************************************************************************/
 package org.eclipse.acceleo.query.parser;
-  
-
 
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 /**
- * This class provides an empty implementation of {@link QueryListener},
- * which can be extended to create a listener which only needs to handle a subset
- * of the available methods.
+ * This class provides an empty implementation of {@link QueryListener}, which can be extended to create a
+ * listener which only needs to handle a subset of the available methods.
  */
 public class QueryBaseListener implements QueryListener {
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
 	 */
-	@Override public void enterEntry(QueryParser.EntryContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitEntry(QueryParser.EntryContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterVarRef(QueryParser.VarRefContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitVarRef(QueryParser.VarRefContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterAdd(QueryParser.AddContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitAdd(QueryParser.AddContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterNav(QueryParser.NavContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitNav(QueryParser.NavContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterOr(QueryParser.OrContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitOr(QueryParser.OrContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterLetExpr(QueryParser.LetExprContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitLetExpr(QueryParser.LetExprContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterConditional(QueryParser.ConditionalContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitConditional(QueryParser.ConditionalContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterComp(QueryParser.CompContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitComp(QueryParser.CompContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterNot(QueryParser.NotContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitNot(QueryParser.NotContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterMin(QueryParser.MinContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitMin(QueryParser.MinContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterImplies(QueryParser.ImpliesContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitImplies(QueryParser.ImpliesContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterMult(QueryParser.MultContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitMult(QueryParser.MultContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterLit(QueryParser.LitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitLit(QueryParser.LitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterAnd(QueryParser.AndContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitAnd(QueryParser.AndContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterXor(QueryParser.XorContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitXor(QueryParser.XorContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterParen(QueryParser.ParenContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitParen(QueryParser.ParenContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterBinding(QueryParser.BindingContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitBinding(QueryParser.BindingContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterAddOp(QueryParser.AddOpContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitAddOp(QueryParser.AddOpContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterCompOp(QueryParser.CompOpContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitCompOp(QueryParser.CompOpContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterFeature(QueryParser.FeatureContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitFeature(QueryParser.FeatureContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterCallOrApply(QueryParser.CallOrApplyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitCallOrApply(QueryParser.CallOrApplyContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterCollectionCall(QueryParser.CollectionCallContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitCollectionCall(QueryParser.CollectionCallContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterIterationCall(QueryParser.IterationCallContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitIterationCall(QueryParser.IterationCallContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterServiceCall(QueryParser.ServiceCallContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitServiceCall(QueryParser.ServiceCallContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterLambdaExpression(QueryParser.LambdaExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitLambdaExpression(QueryParser.LambdaExpressionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterCollectionIterator(QueryParser.CollectionIteratorContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitCollectionIterator(QueryParser.CollectionIteratorContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterExpressionSequence(QueryParser.ExpressionSequenceContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitExpressionSequence(QueryParser.ExpressionSequenceContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterVariableDefinition(QueryParser.VariableDefinitionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitVariableDefinition(QueryParser.VariableDefinitionContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterStringLit(QueryParser.StringLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitStringLit(QueryParser.StringLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterErrorStringLit(QueryParser.ErrorStringLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitErrorStringLit(QueryParser.ErrorStringLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterIntegerLit(QueryParser.IntegerLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitIntegerLit(QueryParser.IntegerLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterRealLit(QueryParser.RealLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitRealLit(QueryParser.RealLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterTrueLit(QueryParser.TrueLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitTrueLit(QueryParser.TrueLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterFalseLit(QueryParser.FalseLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitFalseLit(QueryParser.FalseLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterNullLit(QueryParser.NullLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitNullLit(QueryParser.NullLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterExplicitSeqLit(QueryParser.ExplicitSeqLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitExplicitSeqLit(QueryParser.ExplicitSeqLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterExplicitSetLit(QueryParser.ExplicitSetLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitExplicitSetLit(QueryParser.ExplicitSetLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterEnumLit(QueryParser.EnumLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitEnumLit(QueryParser.EnumLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterErrorEnumLit(QueryParser.ErrorEnumLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitErrorEnumLit(QueryParser.ErrorEnumLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterTypeLit(QueryParser.TypeLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitTypeLit(QueryParser.TypeLitContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterStrType(QueryParser.StrTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitStrType(QueryParser.StrTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterIntType(QueryParser.IntTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitIntType(QueryParser.IntTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterRealType(QueryParser.RealTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitRealType(QueryParser.RealTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterBooleanType(QueryParser.BooleanTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitBooleanType(QueryParser.BooleanTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterSeqType(QueryParser.SeqTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitSeqType(QueryParser.SeqTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterSetType(QueryParser.SetTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitSetType(QueryParser.SetTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterClsType(QueryParser.ClsTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitClsType(QueryParser.ClsTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterClassifierSetType(QueryParser.ClassifierSetTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitClassifierSetType(QueryParser.ClassifierSetTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterClassifierType(QueryParser.ClassifierTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitClassifierType(QueryParser.ClassifierTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void enterErrorClassifierType(QueryParser.ErrorClassifierTypeContext ctx) { }
-	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
-	 */
-	@Override public void exitErrorClassifierType(QueryParser.ErrorClassifierTypeContext ctx) { }
+	@Override
+	public void enterEntry(QueryParser.EntryContext ctx) {
+	}
 
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
 	 */
-	@Override public void enterEveryRule(ParserRuleContext ctx) { }
+	@Override
+	public void exitEntry(QueryParser.EntryContext ctx) {
+	}
+
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
 	 */
-	@Override public void exitEveryRule(ParserRuleContext ctx) { }
+	@Override
+	public void enterVarRef(QueryParser.VarRefContext ctx) {
+	}
+
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
 	 */
-	@Override public void visitTerminal(TerminalNode node) { }
+	@Override
+	public void exitVarRef(QueryParser.VarRefContext ctx) {
+	}
+
 	/**
 	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation does nothing.</p>
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
 	 */
-	@Override public void visitErrorNode(ErrorNode node) { }
-}
\ No newline at end of file
+	@Override
+	public void enterAdd(QueryParser.AddContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitAdd(QueryParser.AddContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterNav(QueryParser.NavContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitNav(QueryParser.NavContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterOr(QueryParser.OrContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitOr(QueryParser.OrContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterLetExpr(QueryParser.LetExprContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitLetExpr(QueryParser.LetExprContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterConditional(QueryParser.ConditionalContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitConditional(QueryParser.ConditionalContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterComp(QueryParser.CompContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitComp(QueryParser.CompContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterNot(QueryParser.NotContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitNot(QueryParser.NotContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterMin(QueryParser.MinContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitMin(QueryParser.MinContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterImplies(QueryParser.ImpliesContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitImplies(QueryParser.ImpliesContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterMult(QueryParser.MultContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitMult(QueryParser.MultContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterLit(QueryParser.LitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitLit(QueryParser.LitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterAnd(QueryParser.AndContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitAnd(QueryParser.AndContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterXor(QueryParser.XorContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitXor(QueryParser.XorContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterParen(QueryParser.ParenContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitParen(QueryParser.ParenContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterBinding(QueryParser.BindingContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitBinding(QueryParser.BindingContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterAddOp(QueryParser.AddOpContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitAddOp(QueryParser.AddOpContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterCompOp(QueryParser.CompOpContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitCompOp(QueryParser.CompOpContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterFeature(QueryParser.FeatureContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitFeature(QueryParser.FeatureContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterCallOrApply(QueryParser.CallOrApplyContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitCallOrApply(QueryParser.CallOrApplyContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterCollectionCall(QueryParser.CollectionCallContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitCollectionCall(QueryParser.CollectionCallContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterIterationCall(QueryParser.IterationCallContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitIterationCall(QueryParser.IterationCallContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterServiceCall(QueryParser.ServiceCallContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitServiceCall(QueryParser.ServiceCallContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterLambdaExpression(QueryParser.LambdaExpressionContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitLambdaExpression(QueryParser.LambdaExpressionContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterCollectionIterator(QueryParser.CollectionIteratorContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitCollectionIterator(QueryParser.CollectionIteratorContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterExpressionSequence(QueryParser.ExpressionSequenceContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitExpressionSequence(QueryParser.ExpressionSequenceContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterVariableDefinition(QueryParser.VariableDefinitionContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitVariableDefinition(QueryParser.VariableDefinitionContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterStringLit(QueryParser.StringLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitStringLit(QueryParser.StringLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterErrorStringLit(QueryParser.ErrorStringLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitErrorStringLit(QueryParser.ErrorStringLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterIntegerLit(QueryParser.IntegerLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitIntegerLit(QueryParser.IntegerLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterRealLit(QueryParser.RealLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitRealLit(QueryParser.RealLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterTrueLit(QueryParser.TrueLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitTrueLit(QueryParser.TrueLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterFalseLit(QueryParser.FalseLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitFalseLit(QueryParser.FalseLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterNullLit(QueryParser.NullLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitNullLit(QueryParser.NullLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterExplicitSeqLit(QueryParser.ExplicitSeqLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitExplicitSeqLit(QueryParser.ExplicitSeqLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterExplicitSetLit(QueryParser.ExplicitSetLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitExplicitSetLit(QueryParser.ExplicitSetLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterEnumLit(QueryParser.EnumLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitEnumLit(QueryParser.EnumLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterErrorEnumLit(QueryParser.ErrorEnumLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitErrorEnumLit(QueryParser.ErrorEnumLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterTypeLit(QueryParser.TypeLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitTypeLit(QueryParser.TypeLitContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterStrType(QueryParser.StrTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitStrType(QueryParser.StrTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterIntType(QueryParser.IntTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitIntType(QueryParser.IntTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterRealType(QueryParser.RealTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitRealType(QueryParser.RealTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterBooleanType(QueryParser.BooleanTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitBooleanType(QueryParser.BooleanTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterSeqType(QueryParser.SeqTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitSeqType(QueryParser.SeqTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterSetType(QueryParser.SetTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitSetType(QueryParser.SetTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterClsType(QueryParser.ClsTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitClsType(QueryParser.ClsTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterClassifierSetType(QueryParser.ClassifierSetTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitClassifierSetType(QueryParser.ClassifierSetTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterClassifierType(QueryParser.ClassifierTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitClassifierType(QueryParser.ClassifierTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterErrorClassifierType(QueryParser.ErrorClassifierTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitErrorClassifierType(QueryParser.ErrorClassifierTypeContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void enterEveryRule(ParserRuleContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void exitEveryRule(ParserRuleContext ctx) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void visitTerminal(TerminalNode node) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * The default implementation does nothing.
+	 * </p>
+	 */
+	@Override
+	public void visitErrorNode(ErrorNode node) {
+	}
+}
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryLexer.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryLexer.java
index 4d6fb19..81c631a 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryLexer.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryLexer.java
@@ -11,78 +11,75 @@
  *     Obeo - initial API and implementation
  *******************************************************************************/
 package org.eclipse.acceleo.query.parser;
-  
 
-import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.TokenStream;
-import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.atn.*;
+import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.RuntimeMetaData;
+import org.antlr.v4.runtime.Vocabulary;
+import org.antlr.v4.runtime.VocabularyImpl;
+import org.antlr.v4.runtime.atn.ATN;
+import org.antlr.v4.runtime.atn.ATNDeserializer;
+import org.antlr.v4.runtime.atn.LexerATNSimulator;
+import org.antlr.v4.runtime.atn.PredictionContextCache;
 import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.misc.*;
 
-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
+@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast" })
 public class QueryLexer extends Lexer {
-	static { RuntimeMetaData.checkVersion("4.7.2", RuntimeMetaData.VERSION); }
+	static {
+		RuntimeMetaData.checkVersion("4.7.2", RuntimeMetaData.VERSION);
+	}
 
 	protected static final DFA[] _decisionToDFA;
-	protected static final PredictionContextCache _sharedContextCache =
-		new PredictionContextCache();
-	public static final int
-		T__0=1, T__1=2, T__2=3, T__3=4, T__4=5, T__5=6, T__6=7, T__7=8, T__8=9, 
-		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, T__16=17, 
-		T__17=18, T__18=19, T__19=20, T__20=21, T__21=22, T__22=23, T__23=24, 
-		T__24=25, T__25=26, T__26=27, T__27=28, T__28=29, T__29=30, T__30=31, 
-		T__31=32, T__32=33, T__33=34, T__34=35, T__35=36, T__36=37, T__37=38, 
-		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, T__44=45, 
-		T__45=46, T__46=47, T__47=48, T__48=49, T__49=50, T__50=51, T__51=52, 
-		WS=53, MultOp=54, Integer=55, Real=56, String=57, ErrorString=58, Ident=59;
-	public static String[] channelNames = {
-		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
-	};
 
-	public static String[] modeNames = {
-		"DEFAULT_MODE"
-	};
+	protected static final PredictionContextCache _sharedContextCache = new PredictionContextCache();
+
+	public static final int T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, T__6 = 7, T__7 = 8,
+			T__8 = 9, T__9 = 10, T__10 = 11, T__11 = 12, T__12 = 13, T__13 = 14, T__14 = 15, T__15 = 16,
+			T__16 = 17, T__17 = 18, T__18 = 19, T__19 = 20, T__20 = 21, T__21 = 22, T__22 = 23, T__23 = 24,
+			T__24 = 25, T__25 = 26, T__26 = 27, T__27 = 28, T__28 = 29, T__29 = 30, T__30 = 31, T__31 = 32,
+			T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36, T__36 = 37, T__37 = 38, T__38 = 39, T__39 = 40,
+			T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, T__44 = 45, T__45 = 46, T__46 = 47, T__47 = 48,
+			T__48 = 49, T__49 = 50, T__50 = 51, T__51 = 52, WS = 53, MultOp = 54, Integer = 55, Real = 56,
+			String = 57, ErrorString = 58, Ident = 59;
+
+	public static String[] channelNames = {"DEFAULT_TOKEN_CHANNEL", "HIDDEN" };
+
+	public static String[] modeNames = {"DEFAULT_MODE" };
 
 	private static String[] makeRuleNames() {
-		return new String[] {
-			"T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "T__8", 
-			"T__9", "T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "T__16", 
-			"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", "WS", "MultOp", "Integer", "Real", "String", 
-			"ErrorString", "Escape", "Ident", "Letter"
-		};
+		return new String[] {"T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "T__8", "T__9",
+				"T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "T__16", "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", "WS", "MultOp", "Integer", "Real", "String", "ErrorString", "Escape",
+				"Ident", "Letter" };
 	}
+
 	public static final String[] ruleNames = makeRuleNames();
 
 	private static String[] makeLiteralNames() {
-		return new String[] {
-			null, "'not'", "'-'", "'and'", "'or'", "'xor'", "'implies'", "'('", "')'", 
-			"'if'", "'then'", "'else'", "'endif'", "'let'", "','", "'in'", "':'", 
-			"'='", "'+'", "'<='", "'>='", "'!='", "'<>'", "'=='", "'<'", "'>'", "'.'", 
-			"'->'", "'select'", "'reject'", "'collect'", "'any'", "'exists'", "'forAll'", 
-			"'isUnique'", "'one'", "'sortedBy'", "'closure'", "'|'", "'true'", "'false'", 
-			"'null'", "'Sequence{'", "'}'", "'OrderedSet{'", "'::'", "'String'", 
-			"'Integer'", "'Real'", "'Boolean'", "'Sequence('", "'OrderedSet('", "'{'"
-		};
+		return new String[] {null, "'not'", "'-'", "'and'", "'or'", "'xor'", "'implies'", "'('", "')'",
+				"'if'", "'then'", "'else'", "'endif'", "'let'", "','", "'in'", "':'", "'='", "'+'", "'<='",
+				"'>='", "'!='", "'<>'", "'=='", "'<'", "'>'", "'.'", "'->'", "'select'", "'reject'",
+				"'collect'", "'any'", "'exists'", "'forAll'", "'isUnique'", "'one'", "'sortedBy'",
+				"'closure'", "'|'", "'true'", "'false'", "'null'", "'Sequence{'", "'}'", "'OrderedSet{'",
+				"'::'", "'String'", "'Integer'", "'Real'", "'Boolean'", "'Sequence('", "'OrderedSet('",
+				"'{'" };
 	}
+
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
+
 	private static String[] makeSymbolicNames() {
-		return new String[] {
-			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, "WS", "MultOp", "Integer", "Real", "String", 
-			"ErrorString", "Ident"
-		};
+		return new String[] {null, null, null, null, null, null, null, null, null, null, null, null, null,
+				null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+				null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+				null, null, null, null, null, null, null, null, null, null, "WS", "MultOp", "Integer", "Real",
+				"String", "ErrorString", "Ident" };
 	}
+
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
+
 	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
 	/**
@@ -116,179 +113,189 @@
 		return VOCABULARY;
 	}
 
-
 	public QueryLexer(CharStream input) {
 		super(input);
-		_interp = new LexerATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
+		_interp = new LexerATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
 	}
 
 	@Override
-	public String getGrammarFileName() { return "Query.g4"; }
+	public String getGrammarFileName() {
+		return "Query.g4";
+	}
 
 	@Override
-	public String[] getRuleNames() { return ruleNames; }
+	public String[] getRuleNames() {
+		return ruleNames;
+	}
 
 	@Override
-	public String getSerializedATN() { return _serializedATN; }
+	public String getSerializedATN() {
+		return _serializedATN;
+	}
 
 	@Override
-	public String[] getChannelNames() { return channelNames; }
+	public String[] getChannelNames() {
+		return channelNames;
+	}
 
 	@Override
-	public String[] getModeNames() { return modeNames; }
+	public String[] getModeNames() {
+		return modeNames;
+	}
 
 	@Override
-	public ATN getATN() { return _ATN; }
+	public ATN getATN() {
+		return _ATN;
+	}
 
-	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2=\u01b9\b\1\4\2\t"+
-		"\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"+
-		"\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
-		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
-		"\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"+
-		"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"+
-		",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t"+
-		"\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t="+
-		"\4>\t>\3\2\3\2\3\2\3\2\3\3\3\3\3\4\3\4\3\4\3\4\3\5\3\5\3\5\3\6\3\6\3\6"+
-		"\3\6\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\t\3\t\3\n\3\n\3\n\3\13"+
-		"\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r\3\r\3\r\3\r\3\16"+
-		"\3\16\3\16\3\16\3\17\3\17\3\20\3\20\3\20\3\21\3\21\3\22\3\22\3\23\3\23"+
-		"\3\24\3\24\3\24\3\25\3\25\3\25\3\26\3\26\3\26\3\27\3\27\3\27\3\30\3\30"+
-		"\3\30\3\31\3\31\3\32\3\32\3\33\3\33\3\34\3\34\3\34\3\35\3\35\3\35\3\35"+
-		"\3\35\3\35\3\35\3\36\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37"+
-		"\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3!\3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\""+
-		"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3#\3#\3#\3#\3$\3$\3$\3$\3%\3%\3%\3%\3%\3%"+
-		"\3%\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\3\'\3\'\3(\3(\3(\3(\3(\3)\3)\3)\3)\3"+
-		")\3)\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3+\3+\3+\3+\3,\3,\3-\3-\3-\3-\3"+
-		"-\3-\3-\3-\3-\3-\3-\3-\3.\3.\3.\3/\3/\3/\3/\3/\3/\3/\3\60\3\60\3\60\3"+
-		"\60\3\60\3\60\3\60\3\60\3\61\3\61\3\61\3\61\3\61\3\62\3\62\3\62\3\62\3"+
-		"\62\3\62\3\62\3\62\3\63\3\63\3\63\3\63\3\63\3\63\3\63\3\63\3\63\3\63\3"+
-		"\64\3\64\3\64\3\64\3\64\3\64\3\64\3\64\3\64\3\64\3\64\3\64\3\65\3\65\3"+
-		"\66\6\66\u017d\n\66\r\66\16\66\u017e\3\66\3\66\3\67\3\67\38\68\u0186\n"+
-		"8\r8\168\u0187\39\69\u018b\n9\r9\169\u018c\39\39\69\u0191\n9\r9\169\u0192"+
-		"\3:\3:\3:\7:\u0198\n:\f:\16:\u019b\13:\3:\3:\3;\3;\3;\7;\u01a2\n;\f;\16"+
-		";\u01a5\13;\3<\3<\3<\3<\5<\u01ab\n<\3=\3=\5=\u01af\n=\3=\3=\7=\u01b3\n"+
-		"=\f=\16=\u01b6\13=\3>\3>\4\u0199\u01a3\2?\3\3\5\4\7\5\t\6\13\7\r\b\17"+
-		"\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26+"+
-		"\27-\30/\31\61\32\63\33\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+"+
-		"U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67m8o9q:s;u<w\2y={\2\3\2\b\5\2\13"+
-		"\f\17\17\"\"\4\2,,\61\61\3\2\62;\3\2))\4\2\62;aa\4\2C\\c|\2\u01c2\2\3"+
-		"\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2"+
-		"\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31"+
-		"\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2"+
-		"\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2"+
-		"\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2"+
-		"\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2"+
-		"I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3"+
-		"\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2"+
-		"\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2"+
-		"o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2y\3\2\2\2\3}\3\2\2\2\5\u0081"+
-		"\3\2\2\2\7\u0083\3\2\2\2\t\u0087\3\2\2\2\13\u008a\3\2\2\2\r\u008e\3\2"+
-		"\2\2\17\u0096\3\2\2\2\21\u0098\3\2\2\2\23\u009a\3\2\2\2\25\u009d\3\2\2"+
-		"\2\27\u00a2\3\2\2\2\31\u00a7\3\2\2\2\33\u00ad\3\2\2\2\35\u00b1\3\2\2\2"+
-		"\37\u00b3\3\2\2\2!\u00b6\3\2\2\2#\u00b8\3\2\2\2%\u00ba\3\2\2\2\'\u00bc"+
-		"\3\2\2\2)\u00bf\3\2\2\2+\u00c2\3\2\2\2-\u00c5\3\2\2\2/\u00c8\3\2\2\2\61"+
-		"\u00cb\3\2\2\2\63\u00cd\3\2\2\2\65\u00cf\3\2\2\2\67\u00d1\3\2\2\29\u00d4"+
-		"\3\2\2\2;\u00db\3\2\2\2=\u00e2\3\2\2\2?\u00ea\3\2\2\2A\u00ee\3\2\2\2C"+
-		"\u00f5\3\2\2\2E\u00fc\3\2\2\2G\u0105\3\2\2\2I\u0109\3\2\2\2K\u0112\3\2"+
-		"\2\2M\u011a\3\2\2\2O\u011c\3\2\2\2Q\u0121\3\2\2\2S\u0127\3\2\2\2U\u012c"+
-		"\3\2\2\2W\u0136\3\2\2\2Y\u0138\3\2\2\2[\u0144\3\2\2\2]\u0147\3\2\2\2_"+
-		"\u014e\3\2\2\2a\u0156\3\2\2\2c\u015b\3\2\2\2e\u0163\3\2\2\2g\u016d\3\2"+
-		"\2\2i\u0179\3\2\2\2k\u017c\3\2\2\2m\u0182\3\2\2\2o\u0185\3\2\2\2q\u018a"+
-		"\3\2\2\2s\u0194\3\2\2\2u\u019e\3\2\2\2w\u01aa\3\2\2\2y\u01ae\3\2\2\2{"+
-		"\u01b7\3\2\2\2}~\7p\2\2~\177\7q\2\2\177\u0080\7v\2\2\u0080\4\3\2\2\2\u0081"+
-		"\u0082\7/\2\2\u0082\6\3\2\2\2\u0083\u0084\7c\2\2\u0084\u0085\7p\2\2\u0085"+
-		"\u0086\7f\2\2\u0086\b\3\2\2\2\u0087\u0088\7q\2\2\u0088\u0089\7t\2\2\u0089"+
-		"\n\3\2\2\2\u008a\u008b\7z\2\2\u008b\u008c\7q\2\2\u008c\u008d\7t\2\2\u008d"+
-		"\f\3\2\2\2\u008e\u008f\7k\2\2\u008f\u0090\7o\2\2\u0090\u0091\7r\2\2\u0091"+
-		"\u0092\7n\2\2\u0092\u0093\7k\2\2\u0093\u0094\7g\2\2\u0094\u0095\7u\2\2"+
-		"\u0095\16\3\2\2\2\u0096\u0097\7*\2\2\u0097\20\3\2\2\2\u0098\u0099\7+\2"+
-		"\2\u0099\22\3\2\2\2\u009a\u009b\7k\2\2\u009b\u009c\7h\2\2\u009c\24\3\2"+
-		"\2\2\u009d\u009e\7v\2\2\u009e\u009f\7j\2\2\u009f\u00a0\7g\2\2\u00a0\u00a1"+
-		"\7p\2\2\u00a1\26\3\2\2\2\u00a2\u00a3\7g\2\2\u00a3\u00a4\7n\2\2\u00a4\u00a5"+
-		"\7u\2\2\u00a5\u00a6\7g\2\2\u00a6\30\3\2\2\2\u00a7\u00a8\7g\2\2\u00a8\u00a9"+
-		"\7p\2\2\u00a9\u00aa\7f\2\2\u00aa\u00ab\7k\2\2\u00ab\u00ac\7h\2\2\u00ac"+
-		"\32\3\2\2\2\u00ad\u00ae\7n\2\2\u00ae\u00af\7g\2\2\u00af\u00b0\7v\2\2\u00b0"+
-		"\34\3\2\2\2\u00b1\u00b2\7.\2\2\u00b2\36\3\2\2\2\u00b3\u00b4\7k\2\2\u00b4"+
-		"\u00b5\7p\2\2\u00b5 \3\2\2\2\u00b6\u00b7\7<\2\2\u00b7\"\3\2\2\2\u00b8"+
-		"\u00b9\7?\2\2\u00b9$\3\2\2\2\u00ba\u00bb\7-\2\2\u00bb&\3\2\2\2\u00bc\u00bd"+
-		"\7>\2\2\u00bd\u00be\7?\2\2\u00be(\3\2\2\2\u00bf\u00c0\7@\2\2\u00c0\u00c1"+
-		"\7?\2\2\u00c1*\3\2\2\2\u00c2\u00c3\7#\2\2\u00c3\u00c4\7?\2\2\u00c4,\3"+
-		"\2\2\2\u00c5\u00c6\7>\2\2\u00c6\u00c7\7@\2\2\u00c7.\3\2\2\2\u00c8\u00c9"+
-		"\7?\2\2\u00c9\u00ca\7?\2\2\u00ca\60\3\2\2\2\u00cb\u00cc\7>\2\2\u00cc\62"+
-		"\3\2\2\2\u00cd\u00ce\7@\2\2\u00ce\64\3\2\2\2\u00cf\u00d0\7\60\2\2\u00d0"+
-		"\66\3\2\2\2\u00d1\u00d2\7/\2\2\u00d2\u00d3\7@\2\2\u00d38\3\2\2\2\u00d4"+
-		"\u00d5\7u\2\2\u00d5\u00d6\7g\2\2\u00d6\u00d7\7n\2\2\u00d7\u00d8\7g\2\2"+
-		"\u00d8\u00d9\7e\2\2\u00d9\u00da\7v\2\2\u00da:\3\2\2\2\u00db\u00dc\7t\2"+
-		"\2\u00dc\u00dd\7g\2\2\u00dd\u00de\7l\2\2\u00de\u00df\7g\2\2\u00df\u00e0"+
-		"\7e\2\2\u00e0\u00e1\7v\2\2\u00e1<\3\2\2\2\u00e2\u00e3\7e\2\2\u00e3\u00e4"+
-		"\7q\2\2\u00e4\u00e5\7n\2\2\u00e5\u00e6\7n\2\2\u00e6\u00e7\7g\2\2\u00e7"+
-		"\u00e8\7e\2\2\u00e8\u00e9\7v\2\2\u00e9>\3\2\2\2\u00ea\u00eb\7c\2\2\u00eb"+
-		"\u00ec\7p\2\2\u00ec\u00ed\7{\2\2\u00ed@\3\2\2\2\u00ee\u00ef\7g\2\2\u00ef"+
-		"\u00f0\7z\2\2\u00f0\u00f1\7k\2\2\u00f1\u00f2\7u\2\2\u00f2\u00f3\7v\2\2"+
-		"\u00f3\u00f4\7u\2\2\u00f4B\3\2\2\2\u00f5\u00f6\7h\2\2\u00f6\u00f7\7q\2"+
-		"\2\u00f7\u00f8\7t\2\2\u00f8\u00f9\7C\2\2\u00f9\u00fa\7n\2\2\u00fa\u00fb"+
-		"\7n\2\2\u00fbD\3\2\2\2\u00fc\u00fd\7k\2\2\u00fd\u00fe\7u\2\2\u00fe\u00ff"+
-		"\7W\2\2\u00ff\u0100\7p\2\2\u0100\u0101\7k\2\2\u0101\u0102\7s\2\2\u0102"+
-		"\u0103\7w\2\2\u0103\u0104\7g\2\2\u0104F\3\2\2\2\u0105\u0106\7q\2\2\u0106"+
-		"\u0107\7p\2\2\u0107\u0108\7g\2\2\u0108H\3\2\2\2\u0109\u010a\7u\2\2\u010a"+
-		"\u010b\7q\2\2\u010b\u010c\7t\2\2\u010c\u010d\7v\2\2\u010d\u010e\7g\2\2"+
-		"\u010e\u010f\7f\2\2\u010f\u0110\7D\2\2\u0110\u0111\7{\2\2\u0111J\3\2\2"+
-		"\2\u0112\u0113\7e\2\2\u0113\u0114\7n\2\2\u0114\u0115\7q\2\2\u0115\u0116"+
-		"\7u\2\2\u0116\u0117\7w\2\2\u0117\u0118\7t\2\2\u0118\u0119\7g\2\2\u0119"+
-		"L\3\2\2\2\u011a\u011b\7~\2\2\u011bN\3\2\2\2\u011c\u011d\7v\2\2\u011d\u011e"+
-		"\7t\2\2\u011e\u011f\7w\2\2\u011f\u0120\7g\2\2\u0120P\3\2\2\2\u0121\u0122"+
-		"\7h\2\2\u0122\u0123\7c\2\2\u0123\u0124\7n\2\2\u0124\u0125\7u\2\2\u0125"+
-		"\u0126\7g\2\2\u0126R\3\2\2\2\u0127\u0128\7p\2\2\u0128\u0129\7w\2\2\u0129"+
-		"\u012a\7n\2\2\u012a\u012b\7n\2\2\u012bT\3\2\2\2\u012c\u012d\7U\2\2\u012d"+
-		"\u012e\7g\2\2\u012e\u012f\7s\2\2\u012f\u0130\7w\2\2\u0130\u0131\7g\2\2"+
-		"\u0131\u0132\7p\2\2\u0132\u0133\7e\2\2\u0133\u0134\7g\2\2\u0134\u0135"+
-		"\7}\2\2\u0135V\3\2\2\2\u0136\u0137\7\177\2\2\u0137X\3\2\2\2\u0138\u0139"+
-		"\7Q\2\2\u0139\u013a\7t\2\2\u013a\u013b\7f\2\2\u013b\u013c\7g\2\2\u013c"+
-		"\u013d\7t\2\2\u013d\u013e\7g\2\2\u013e\u013f\7f\2\2\u013f\u0140\7U\2\2"+
-		"\u0140\u0141\7g\2\2\u0141\u0142\7v\2\2\u0142\u0143\7}\2\2\u0143Z\3\2\2"+
-		"\2\u0144\u0145\7<\2\2\u0145\u0146\7<\2\2\u0146\\\3\2\2\2\u0147\u0148\7"+
-		"U\2\2\u0148\u0149\7v\2\2\u0149\u014a\7t\2\2\u014a\u014b\7k\2\2\u014b\u014c"+
-		"\7p\2\2\u014c\u014d\7i\2\2\u014d^\3\2\2\2\u014e\u014f\7K\2\2\u014f\u0150"+
-		"\7p\2\2\u0150\u0151\7v\2\2\u0151\u0152\7g\2\2\u0152\u0153\7i\2\2\u0153"+
-		"\u0154\7g\2\2\u0154\u0155\7t\2\2\u0155`\3\2\2\2\u0156\u0157\7T\2\2\u0157"+
-		"\u0158\7g\2\2\u0158\u0159\7c\2\2\u0159\u015a\7n\2\2\u015ab\3\2\2\2\u015b"+
-		"\u015c\7D\2\2\u015c\u015d\7q\2\2\u015d\u015e\7q\2\2\u015e\u015f\7n\2\2"+
-		"\u015f\u0160\7g\2\2\u0160\u0161\7c\2\2\u0161\u0162\7p\2\2\u0162d\3\2\2"+
-		"\2\u0163\u0164\7U\2\2\u0164\u0165\7g\2\2\u0165\u0166\7s\2\2\u0166\u0167"+
-		"\7w\2\2\u0167\u0168\7g\2\2\u0168\u0169\7p\2\2\u0169\u016a\7e\2\2\u016a"+
-		"\u016b\7g\2\2\u016b\u016c\7*\2\2\u016cf\3\2\2\2\u016d\u016e\7Q\2\2\u016e"+
-		"\u016f\7t\2\2\u016f\u0170\7f\2\2\u0170\u0171\7g\2\2\u0171\u0172\7t\2\2"+
-		"\u0172\u0173\7g\2\2\u0173\u0174\7f\2\2\u0174\u0175\7U\2\2\u0175\u0176"+
-		"\7g\2\2\u0176\u0177\7v\2\2\u0177\u0178\7*\2\2\u0178h\3\2\2\2\u0179\u017a"+
-		"\7}\2\2\u017aj\3\2\2\2\u017b\u017d\t\2\2\2\u017c\u017b\3\2\2\2\u017d\u017e"+
-		"\3\2\2\2\u017e\u017c\3\2\2\2\u017e\u017f\3\2\2\2\u017f\u0180\3\2\2\2\u0180"+
-		"\u0181\b\66\2\2\u0181l\3\2\2\2\u0182\u0183\t\3\2\2\u0183n\3\2\2\2\u0184"+
-		"\u0186\t\4\2\2\u0185\u0184\3\2\2\2\u0186\u0187\3\2\2\2\u0187\u0185\3\2"+
-		"\2\2\u0187\u0188\3\2\2\2\u0188p\3\2\2\2\u0189\u018b\t\4\2\2\u018a\u0189"+
-		"\3\2\2\2\u018b\u018c\3\2\2\2\u018c\u018a\3\2\2\2\u018c\u018d\3\2\2\2\u018d"+
-		"\u018e\3\2\2\2\u018e\u0190\7\60\2\2\u018f\u0191\t\4\2\2\u0190\u018f\3"+
-		"\2\2\2\u0191\u0192\3\2\2\2\u0192\u0190\3\2\2\2\u0192\u0193\3\2\2\2\u0193"+
-		"r\3\2\2\2\u0194\u0199\7)\2\2\u0195\u0198\5w<\2\u0196\u0198\13\2\2\2\u0197"+
-		"\u0195\3\2\2\2\u0197\u0196\3\2\2\2\u0198\u019b\3\2\2\2\u0199\u019a\3\2"+
-		"\2\2\u0199\u0197\3\2\2\2\u019a\u019c\3\2\2\2\u019b\u0199\3\2\2\2\u019c"+
-		"\u019d\7)\2\2\u019dt\3\2\2\2\u019e\u01a3\7)\2\2\u019f\u01a2\5w<\2\u01a0"+
-		"\u01a2\n\5\2\2\u01a1\u019f\3\2\2\2\u01a1\u01a0\3\2\2\2\u01a2\u01a5\3\2"+
-		"\2\2\u01a3\u01a4\3\2\2\2\u01a3\u01a1\3\2\2\2\u01a4v\3\2\2\2\u01a5\u01a3"+
-		"\3\2\2\2\u01a6\u01a7\7^\2\2\u01a7\u01ab\7^\2\2\u01a8\u01a9\7^\2\2\u01a9"+
-		"\u01ab\7)\2\2\u01aa\u01a6\3\2\2\2\u01aa\u01a8\3\2\2\2\u01abx\3\2\2\2\u01ac"+
-		"\u01af\5{>\2\u01ad\u01af\7a\2\2\u01ae\u01ac\3\2\2\2\u01ae\u01ad\3\2\2"+
-		"\2\u01af\u01b4\3\2\2\2\u01b0\u01b3\5{>\2\u01b1\u01b3\t\6\2\2\u01b2\u01b0"+
-		"\3\2\2\2\u01b2\u01b1\3\2\2\2\u01b3\u01b6\3\2\2\2\u01b4\u01b2\3\2\2\2\u01b4"+
-		"\u01b5\3\2\2\2\u01b5z\3\2\2\2\u01b6\u01b4\3\2\2\2\u01b7\u01b8\t\7\2\2"+
-		"\u01b8|\3\2\2\2\17\2\u017e\u0187\u018c\u0192\u0197\u0199\u01a1\u01a3\u01aa"+
-		"\u01ae\u01b2\u01b4\3\b\2\2";
-	public static final ATN _ATN =
-		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
+	public static final String _serializedATN = "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2=\u01b9\b\1\4\2\t"
+			+ "\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"
+			+ "\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"
+			+ "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"
+			+ "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"
+			+ "\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"
+			+ ",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t"
+			+ "\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t="
+			+ "\4>\t>\3\2\3\2\3\2\3\2\3\3\3\3\3\4\3\4\3\4\3\4\3\5\3\5\3\5\3\6\3\6\3\6"
+			+ "\3\6\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\t\3\t\3\n\3\n\3\n\3\13"
+			+ "\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r\3\r\3\r\3\r\3\16"
+			+ "\3\16\3\16\3\16\3\17\3\17\3\20\3\20\3\20\3\21\3\21\3\22\3\22\3\23\3\23"
+			+ "\3\24\3\24\3\24\3\25\3\25\3\25\3\26\3\26\3\26\3\27\3\27\3\27\3\30\3\30"
+			+ "\3\30\3\31\3\31\3\32\3\32\3\33\3\33\3\34\3\34\3\34\3\35\3\35\3\35\3\35"
+			+ "\3\35\3\35\3\35\3\36\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37"
+			+ "\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3!\3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\""
+			+ "\3\"\3\"\3\"\3#\3#\3#\3#\3#\3#\3#\3#\3#\3$\3$\3$\3$\3%\3%\3%\3%\3%\3%"
+			+ "\3%\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\3\'\3\'\3(\3(\3(\3(\3(\3)\3)\3)\3)\3"
+			+ ")\3)\3*\3*\3*\3*\3*\3+\3+\3+\3+\3+\3+\3+\3+\3+\3+\3,\3,\3-\3-\3-\3-\3"
+			+ "-\3-\3-\3-\3-\3-\3-\3-\3.\3.\3.\3/\3/\3/\3/\3/\3/\3/\3\60\3\60\3\60\3"
+			+ "\60\3\60\3\60\3\60\3\60\3\61\3\61\3\61\3\61\3\61\3\62\3\62\3\62\3\62\3"
+			+ "\62\3\62\3\62\3\62\3\63\3\63\3\63\3\63\3\63\3\63\3\63\3\63\3\63\3\63\3"
+			+ "\64\3\64\3\64\3\64\3\64\3\64\3\64\3\64\3\64\3\64\3\64\3\64\3\65\3\65\3"
+			+ "\66\6\66\u017d\n\66\r\66\16\66\u017e\3\66\3\66\3\67\3\67\38\68\u0186\n"
+			+ "8\r8\168\u0187\39\69\u018b\n9\r9\169\u018c\39\39\69\u0191\n9\r9\169\u0192"
+			+ "\3:\3:\3:\7:\u0198\n:\f:\16:\u019b\13:\3:\3:\3;\3;\3;\7;\u01a2\n;\f;\16"
+			+ ";\u01a5\13;\3<\3<\3<\3<\5<\u01ab\n<\3=\3=\5=\u01af\n=\3=\3=\7=\u01b3\n"
+			+ "=\f=\16=\u01b6\13=\3>\3>\4\u0199\u01a3\2?\3\3\5\4\7\5\t\6\13\7\r\b\17"
+			+ "\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26+"
+			+ "\27-\30/\31\61\32\63\33\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+"
+			+ "U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67m8o9q:s;u<w\2y={\2\3\2\b\5\2\13"
+			+ "\f\17\17\"\"\4\2,,\61\61\3\2\62;\3\2))\4\2\62;aa\4\2C\\c|\2\u01c2\2\3"
+			+ "\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2"
+			+ "\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31"
+			+ "\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2"
+			+ "\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2"
+			+ "\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2"
+			+ "\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2"
+			+ "I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3"
+			+ "\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2"
+			+ "\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2"
+			+ "o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2y\3\2\2\2\3}\3\2\2\2\5\u0081"
+			+ "\3\2\2\2\7\u0083\3\2\2\2\t\u0087\3\2\2\2\13\u008a\3\2\2\2\r\u008e\3\2"
+			+ "\2\2\17\u0096\3\2\2\2\21\u0098\3\2\2\2\23\u009a\3\2\2\2\25\u009d\3\2\2"
+			+ "\2\27\u00a2\3\2\2\2\31\u00a7\3\2\2\2\33\u00ad\3\2\2\2\35\u00b1\3\2\2\2"
+			+ "\37\u00b3\3\2\2\2!\u00b6\3\2\2\2#\u00b8\3\2\2\2%\u00ba\3\2\2\2\'\u00bc"
+			+ "\3\2\2\2)\u00bf\3\2\2\2+\u00c2\3\2\2\2-\u00c5\3\2\2\2/\u00c8\3\2\2\2\61"
+			+ "\u00cb\3\2\2\2\63\u00cd\3\2\2\2\65\u00cf\3\2\2\2\67\u00d1\3\2\2\29\u00d4"
+			+ "\3\2\2\2;\u00db\3\2\2\2=\u00e2\3\2\2\2?\u00ea\3\2\2\2A\u00ee\3\2\2\2C"
+			+ "\u00f5\3\2\2\2E\u00fc\3\2\2\2G\u0105\3\2\2\2I\u0109\3\2\2\2K\u0112\3\2"
+			+ "\2\2M\u011a\3\2\2\2O\u011c\3\2\2\2Q\u0121\3\2\2\2S\u0127\3\2\2\2U\u012c"
+			+ "\3\2\2\2W\u0136\3\2\2\2Y\u0138\3\2\2\2[\u0144\3\2\2\2]\u0147\3\2\2\2_"
+			+ "\u014e\3\2\2\2a\u0156\3\2\2\2c\u015b\3\2\2\2e\u0163\3\2\2\2g\u016d\3\2"
+			+ "\2\2i\u0179\3\2\2\2k\u017c\3\2\2\2m\u0182\3\2\2\2o\u0185\3\2\2\2q\u018a"
+			+ "\3\2\2\2s\u0194\3\2\2\2u\u019e\3\2\2\2w\u01aa\3\2\2\2y\u01ae\3\2\2\2{"
+			+ "\u01b7\3\2\2\2}~\7p\2\2~\177\7q\2\2\177\u0080\7v\2\2\u0080\4\3\2\2\2\u0081"
+			+ "\u0082\7/\2\2\u0082\6\3\2\2\2\u0083\u0084\7c\2\2\u0084\u0085\7p\2\2\u0085"
+			+ "\u0086\7f\2\2\u0086\b\3\2\2\2\u0087\u0088\7q\2\2\u0088\u0089\7t\2\2\u0089"
+			+ "\n\3\2\2\2\u008a\u008b\7z\2\2\u008b\u008c\7q\2\2\u008c\u008d\7t\2\2\u008d"
+			+ "\f\3\2\2\2\u008e\u008f\7k\2\2\u008f\u0090\7o\2\2\u0090\u0091\7r\2\2\u0091"
+			+ "\u0092\7n\2\2\u0092\u0093\7k\2\2\u0093\u0094\7g\2\2\u0094\u0095\7u\2\2"
+			+ "\u0095\16\3\2\2\2\u0096\u0097\7*\2\2\u0097\20\3\2\2\2\u0098\u0099\7+\2"
+			+ "\2\u0099\22\3\2\2\2\u009a\u009b\7k\2\2\u009b\u009c\7h\2\2\u009c\24\3\2"
+			+ "\2\2\u009d\u009e\7v\2\2\u009e\u009f\7j\2\2\u009f\u00a0\7g\2\2\u00a0\u00a1"
+			+ "\7p\2\2\u00a1\26\3\2\2\2\u00a2\u00a3\7g\2\2\u00a3\u00a4\7n\2\2\u00a4\u00a5"
+			+ "\7u\2\2\u00a5\u00a6\7g\2\2\u00a6\30\3\2\2\2\u00a7\u00a8\7g\2\2\u00a8\u00a9"
+			+ "\7p\2\2\u00a9\u00aa\7f\2\2\u00aa\u00ab\7k\2\2\u00ab\u00ac\7h\2\2\u00ac"
+			+ "\32\3\2\2\2\u00ad\u00ae\7n\2\2\u00ae\u00af\7g\2\2\u00af\u00b0\7v\2\2\u00b0"
+			+ "\34\3\2\2\2\u00b1\u00b2\7.\2\2\u00b2\36\3\2\2\2\u00b3\u00b4\7k\2\2\u00b4"
+			+ "\u00b5\7p\2\2\u00b5 \3\2\2\2\u00b6\u00b7\7<\2\2\u00b7\"\3\2\2\2\u00b8"
+			+ "\u00b9\7?\2\2\u00b9$\3\2\2\2\u00ba\u00bb\7-\2\2\u00bb&\3\2\2\2\u00bc\u00bd"
+			+ "\7>\2\2\u00bd\u00be\7?\2\2\u00be(\3\2\2\2\u00bf\u00c0\7@\2\2\u00c0\u00c1"
+			+ "\7?\2\2\u00c1*\3\2\2\2\u00c2\u00c3\7#\2\2\u00c3\u00c4\7?\2\2\u00c4,\3"
+			+ "\2\2\2\u00c5\u00c6\7>\2\2\u00c6\u00c7\7@\2\2\u00c7.\3\2\2\2\u00c8\u00c9"
+			+ "\7?\2\2\u00c9\u00ca\7?\2\2\u00ca\60\3\2\2\2\u00cb\u00cc\7>\2\2\u00cc\62"
+			+ "\3\2\2\2\u00cd\u00ce\7@\2\2\u00ce\64\3\2\2\2\u00cf\u00d0\7\60\2\2\u00d0"
+			+ "\66\3\2\2\2\u00d1\u00d2\7/\2\2\u00d2\u00d3\7@\2\2\u00d38\3\2\2\2\u00d4"
+			+ "\u00d5\7u\2\2\u00d5\u00d6\7g\2\2\u00d6\u00d7\7n\2\2\u00d7\u00d8\7g\2\2"
+			+ "\u00d8\u00d9\7e\2\2\u00d9\u00da\7v\2\2\u00da:\3\2\2\2\u00db\u00dc\7t\2"
+			+ "\2\u00dc\u00dd\7g\2\2\u00dd\u00de\7l\2\2\u00de\u00df\7g\2\2\u00df\u00e0"
+			+ "\7e\2\2\u00e0\u00e1\7v\2\2\u00e1<\3\2\2\2\u00e2\u00e3\7e\2\2\u00e3\u00e4"
+			+ "\7q\2\2\u00e4\u00e5\7n\2\2\u00e5\u00e6\7n\2\2\u00e6\u00e7\7g\2\2\u00e7"
+			+ "\u00e8\7e\2\2\u00e8\u00e9\7v\2\2\u00e9>\3\2\2\2\u00ea\u00eb\7c\2\2\u00eb"
+			+ "\u00ec\7p\2\2\u00ec\u00ed\7{\2\2\u00ed@\3\2\2\2\u00ee\u00ef\7g\2\2\u00ef"
+			+ "\u00f0\7z\2\2\u00f0\u00f1\7k\2\2\u00f1\u00f2\7u\2\2\u00f2\u00f3\7v\2\2"
+			+ "\u00f3\u00f4\7u\2\2\u00f4B\3\2\2\2\u00f5\u00f6\7h\2\2\u00f6\u00f7\7q\2"
+			+ "\2\u00f7\u00f8\7t\2\2\u00f8\u00f9\7C\2\2\u00f9\u00fa\7n\2\2\u00fa\u00fb"
+			+ "\7n\2\2\u00fbD\3\2\2\2\u00fc\u00fd\7k\2\2\u00fd\u00fe\7u\2\2\u00fe\u00ff"
+			+ "\7W\2\2\u00ff\u0100\7p\2\2\u0100\u0101\7k\2\2\u0101\u0102\7s\2\2\u0102"
+			+ "\u0103\7w\2\2\u0103\u0104\7g\2\2\u0104F\3\2\2\2\u0105\u0106\7q\2\2\u0106"
+			+ "\u0107\7p\2\2\u0107\u0108\7g\2\2\u0108H\3\2\2\2\u0109\u010a\7u\2\2\u010a"
+			+ "\u010b\7q\2\2\u010b\u010c\7t\2\2\u010c\u010d\7v\2\2\u010d\u010e\7g\2\2"
+			+ "\u010e\u010f\7f\2\2\u010f\u0110\7D\2\2\u0110\u0111\7{\2\2\u0111J\3\2\2"
+			+ "\2\u0112\u0113\7e\2\2\u0113\u0114\7n\2\2\u0114\u0115\7q\2\2\u0115\u0116"
+			+ "\7u\2\2\u0116\u0117\7w\2\2\u0117\u0118\7t\2\2\u0118\u0119\7g\2\2\u0119"
+			+ "L\3\2\2\2\u011a\u011b\7~\2\2\u011bN\3\2\2\2\u011c\u011d\7v\2\2\u011d\u011e"
+			+ "\7t\2\2\u011e\u011f\7w\2\2\u011f\u0120\7g\2\2\u0120P\3\2\2\2\u0121\u0122"
+			+ "\7h\2\2\u0122\u0123\7c\2\2\u0123\u0124\7n\2\2\u0124\u0125\7u\2\2\u0125"
+			+ "\u0126\7g\2\2\u0126R\3\2\2\2\u0127\u0128\7p\2\2\u0128\u0129\7w\2\2\u0129"
+			+ "\u012a\7n\2\2\u012a\u012b\7n\2\2\u012bT\3\2\2\2\u012c\u012d\7U\2\2\u012d"
+			+ "\u012e\7g\2\2\u012e\u012f\7s\2\2\u012f\u0130\7w\2\2\u0130\u0131\7g\2\2"
+			+ "\u0131\u0132\7p\2\2\u0132\u0133\7e\2\2\u0133\u0134\7g\2\2\u0134\u0135"
+			+ "\7}\2\2\u0135V\3\2\2\2\u0136\u0137\7\177\2\2\u0137X\3\2\2\2\u0138\u0139"
+			+ "\7Q\2\2\u0139\u013a\7t\2\2\u013a\u013b\7f\2\2\u013b\u013c\7g\2\2\u013c"
+			+ "\u013d\7t\2\2\u013d\u013e\7g\2\2\u013e\u013f\7f\2\2\u013f\u0140\7U\2\2"
+			+ "\u0140\u0141\7g\2\2\u0141\u0142\7v\2\2\u0142\u0143\7}\2\2\u0143Z\3\2\2"
+			+ "\2\u0144\u0145\7<\2\2\u0145\u0146\7<\2\2\u0146\\\3\2\2\2\u0147\u0148\7"
+			+ "U\2\2\u0148\u0149\7v\2\2\u0149\u014a\7t\2\2\u014a\u014b\7k\2\2\u014b\u014c"
+			+ "\7p\2\2\u014c\u014d\7i\2\2\u014d^\3\2\2\2\u014e\u014f\7K\2\2\u014f\u0150"
+			+ "\7p\2\2\u0150\u0151\7v\2\2\u0151\u0152\7g\2\2\u0152\u0153\7i\2\2\u0153"
+			+ "\u0154\7g\2\2\u0154\u0155\7t\2\2\u0155`\3\2\2\2\u0156\u0157\7T\2\2\u0157"
+			+ "\u0158\7g\2\2\u0158\u0159\7c\2\2\u0159\u015a\7n\2\2\u015ab\3\2\2\2\u015b"
+			+ "\u015c\7D\2\2\u015c\u015d\7q\2\2\u015d\u015e\7q\2\2\u015e\u015f\7n\2\2"
+			+ "\u015f\u0160\7g\2\2\u0160\u0161\7c\2\2\u0161\u0162\7p\2\2\u0162d\3\2\2"
+			+ "\2\u0163\u0164\7U\2\2\u0164\u0165\7g\2\2\u0165\u0166\7s\2\2\u0166\u0167"
+			+ "\7w\2\2\u0167\u0168\7g\2\2\u0168\u0169\7p\2\2\u0169\u016a\7e\2\2\u016a"
+			+ "\u016b\7g\2\2\u016b\u016c\7*\2\2\u016cf\3\2\2\2\u016d\u016e\7Q\2\2\u016e"
+			+ "\u016f\7t\2\2\u016f\u0170\7f\2\2\u0170\u0171\7g\2\2\u0171\u0172\7t\2\2"
+			+ "\u0172\u0173\7g\2\2\u0173\u0174\7f\2\2\u0174\u0175\7U\2\2\u0175\u0176"
+			+ "\7g\2\2\u0176\u0177\7v\2\2\u0177\u0178\7*\2\2\u0178h\3\2\2\2\u0179\u017a"
+			+ "\7}\2\2\u017aj\3\2\2\2\u017b\u017d\t\2\2\2\u017c\u017b\3\2\2\2\u017d\u017e"
+			+ "\3\2\2\2\u017e\u017c\3\2\2\2\u017e\u017f\3\2\2\2\u017f\u0180\3\2\2\2\u0180"
+			+ "\u0181\b\66\2\2\u0181l\3\2\2\2\u0182\u0183\t\3\2\2\u0183n\3\2\2\2\u0184"
+			+ "\u0186\t\4\2\2\u0185\u0184\3\2\2\2\u0186\u0187\3\2\2\2\u0187\u0185\3\2"
+			+ "\2\2\u0187\u0188\3\2\2\2\u0188p\3\2\2\2\u0189\u018b\t\4\2\2\u018a\u0189"
+			+ "\3\2\2\2\u018b\u018c\3\2\2\2\u018c\u018a\3\2\2\2\u018c\u018d\3\2\2\2\u018d"
+			+ "\u018e\3\2\2\2\u018e\u0190\7\60\2\2\u018f\u0191\t\4\2\2\u0190\u018f\3"
+			+ "\2\2\2\u0191\u0192\3\2\2\2\u0192\u0190\3\2\2\2\u0192\u0193\3\2\2\2\u0193"
+			+ "r\3\2\2\2\u0194\u0199\7)\2\2\u0195\u0198\5w<\2\u0196\u0198\13\2\2\2\u0197"
+			+ "\u0195\3\2\2\2\u0197\u0196\3\2\2\2\u0198\u019b\3\2\2\2\u0199\u019a\3\2"
+			+ "\2\2\u0199\u0197\3\2\2\2\u019a\u019c\3\2\2\2\u019b\u0199\3\2\2\2\u019c"
+			+ "\u019d\7)\2\2\u019dt\3\2\2\2\u019e\u01a3\7)\2\2\u019f\u01a2\5w<\2\u01a0"
+			+ "\u01a2\n\5\2\2\u01a1\u019f\3\2\2\2\u01a1\u01a0\3\2\2\2\u01a2\u01a5\3\2"
+			+ "\2\2\u01a3\u01a4\3\2\2\2\u01a3\u01a1\3\2\2\2\u01a4v\3\2\2\2\u01a5\u01a3"
+			+ "\3\2\2\2\u01a6\u01a7\7^\2\2\u01a7\u01ab\7^\2\2\u01a8\u01a9\7^\2\2\u01a9"
+			+ "\u01ab\7)\2\2\u01aa\u01a6\3\2\2\2\u01aa\u01a8\3\2\2\2\u01abx\3\2\2\2\u01ac"
+			+ "\u01af\5{>\2\u01ad\u01af\7a\2\2\u01ae\u01ac\3\2\2\2\u01ae\u01ad\3\2\2"
+			+ "\2\u01af\u01b4\3\2\2\2\u01b0\u01b3\5{>\2\u01b1\u01b3\t\6\2\2\u01b2\u01b0"
+			+ "\3\2\2\2\u01b2\u01b1\3\2\2\2\u01b3\u01b6\3\2\2\2\u01b4\u01b2\3\2\2\2\u01b4"
+			+ "\u01b5\3\2\2\2\u01b5z\3\2\2\2\u01b6\u01b4\3\2\2\2\u01b7\u01b8\t\7\2\2"
+			+ "\u01b8|\3\2\2\2\17\2\u017e\u0187\u018c\u0192\u0197\u0199\u01a1\u01a3\u01aa"
+			+ "\u01ae\u01b2\u01b4\3\b\2\2";
+
+	public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
 		_decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
 		for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
 			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryListener.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryListener.java
index fc816c4..bdc85bb 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryListener.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryListener.java
@@ -11,597 +11,858 @@
  *     Obeo - initial API and implementation
  *******************************************************************************/
 package org.eclipse.acceleo.query.parser;
-  
 
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 
 /**
- * This interface defines a complete listener for a parse tree produced by
- * {@link QueryParser}.
+ * This interface defines a complete listener for a parse tree produced by {@link QueryParser}.
  */
 public interface QueryListener extends ParseTreeListener {
 	/**
 	 * Enter a parse tree produced by {@link QueryParser#entry}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterEntry(QueryParser.EntryContext ctx);
+
 	/**
 	 * Exit a parse tree produced by {@link QueryParser#entry}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitEntry(QueryParser.EntryContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code VarRef}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code VarRef} labeled alternative in
+	 * {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterVarRef(QueryParser.VarRefContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code VarRef}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code VarRef} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitVarRef(QueryParser.VarRefContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code Add}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code Add} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterAdd(QueryParser.AddContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code Add}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code Add} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitAdd(QueryParser.AddContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code Nav}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code Nav} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterNav(QueryParser.NavContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code Nav}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code Nav} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitNav(QueryParser.NavContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code Or}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code Or} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterOr(QueryParser.OrContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code Or}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code Or} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitOr(QueryParser.OrContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code LetExpr}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code LetExpr} labeled alternative in
+	 * {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterLetExpr(QueryParser.LetExprContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code LetExpr}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code LetExpr} labeled alternative in
+	 * {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitLetExpr(QueryParser.LetExprContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code Conditional}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code Conditional} labeled alternative in
+	 * {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterConditional(QueryParser.ConditionalContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code Conditional}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code Conditional} labeled alternative in
+	 * {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitConditional(QueryParser.ConditionalContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code Comp}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code Comp} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterComp(QueryParser.CompContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code Comp}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code Comp} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitComp(QueryParser.CompContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code Not}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code Not} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterNot(QueryParser.NotContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code Not}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code Not} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitNot(QueryParser.NotContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code Min}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code Min} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterMin(QueryParser.MinContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code Min}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code Min} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitMin(QueryParser.MinContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code Implies}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code Implies} labeled alternative in
+	 * {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterImplies(QueryParser.ImpliesContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code Implies}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code Implies} labeled alternative in
+	 * {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitImplies(QueryParser.ImpliesContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code Mult}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code Mult} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterMult(QueryParser.MultContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code Mult}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code Mult} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitMult(QueryParser.MultContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code Lit}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code Lit} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterLit(QueryParser.LitContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code Lit}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code Lit} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitLit(QueryParser.LitContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code And}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code And} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterAnd(QueryParser.AndContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code And}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code And} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitAnd(QueryParser.AndContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code Xor}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code Xor} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterXor(QueryParser.XorContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code Xor}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code Xor} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitXor(QueryParser.XorContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code Paren}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code Paren} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterParen(QueryParser.ParenContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code Paren}
-	 * labeled alternative in {@link QueryParser#expression}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code Paren} labeled alternative in {@link QueryParser#expression}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitParen(QueryParser.ParenContext ctx);
+
 	/**
 	 * Enter a parse tree produced by {@link QueryParser#binding}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterBinding(QueryParser.BindingContext ctx);
+
 	/**
 	 * Exit a parse tree produced by {@link QueryParser#binding}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitBinding(QueryParser.BindingContext ctx);
+
 	/**
 	 * Enter a parse tree produced by {@link QueryParser#addOp}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterAddOp(QueryParser.AddOpContext ctx);
+
 	/**
 	 * Exit a parse tree produced by {@link QueryParser#addOp}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitAddOp(QueryParser.AddOpContext ctx);
+
 	/**
 	 * Enter a parse tree produced by {@link QueryParser#compOp}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterCompOp(QueryParser.CompOpContext ctx);
+
 	/**
 	 * Exit a parse tree produced by {@link QueryParser#compOp}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitCompOp(QueryParser.CompOpContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code Feature}
-	 * labeled alternative in {@link QueryParser#navigationSegment}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code Feature} labeled alternative in
+	 * {@link QueryParser#navigationSegment}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterFeature(QueryParser.FeatureContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code Feature}
-	 * labeled alternative in {@link QueryParser#navigationSegment}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code Feature} labeled alternative in
+	 * {@link QueryParser#navigationSegment}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitFeature(QueryParser.FeatureContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code CallOrApply}
-	 * labeled alternative in {@link QueryParser#navigationSegment}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code CallOrApply} labeled alternative in
+	 * {@link QueryParser#navigationSegment}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterCallOrApply(QueryParser.CallOrApplyContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code CallOrApply}
-	 * labeled alternative in {@link QueryParser#navigationSegment}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code CallOrApply} labeled alternative in
+	 * {@link QueryParser#navigationSegment}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitCallOrApply(QueryParser.CallOrApplyContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code CollectionCall}
-	 * labeled alternative in {@link QueryParser#navigationSegment}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code CollectionCall} labeled alternative in
+	 * {@link QueryParser#navigationSegment}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterCollectionCall(QueryParser.CollectionCallContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code CollectionCall}
-	 * labeled alternative in {@link QueryParser#navigationSegment}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code CollectionCall} labeled alternative in
+	 * {@link QueryParser#navigationSegment}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitCollectionCall(QueryParser.CollectionCallContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code IterationCall}
-	 * labeled alternative in {@link QueryParser#callExp}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code IterationCall} labeled alternative in
+	 * {@link QueryParser#callExp}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterIterationCall(QueryParser.IterationCallContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code IterationCall}
-	 * labeled alternative in {@link QueryParser#callExp}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code IterationCall} labeled alternative in
+	 * {@link QueryParser#callExp}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitIterationCall(QueryParser.IterationCallContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code ServiceCall}
-	 * labeled alternative in {@link QueryParser#callExp}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code ServiceCall} labeled alternative in
+	 * {@link QueryParser#callExp}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterServiceCall(QueryParser.ServiceCallContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code ServiceCall}
-	 * labeled alternative in {@link QueryParser#callExp}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code ServiceCall} labeled alternative in
+	 * {@link QueryParser#callExp}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitServiceCall(QueryParser.ServiceCallContext ctx);
+
 	/**
 	 * Enter a parse tree produced by {@link QueryParser#lambdaExpression}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterLambdaExpression(QueryParser.LambdaExpressionContext ctx);
+
 	/**
 	 * Exit a parse tree produced by {@link QueryParser#lambdaExpression}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitLambdaExpression(QueryParser.LambdaExpressionContext ctx);
+
 	/**
 	 * Enter a parse tree produced by {@link QueryParser#collectionIterator}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterCollectionIterator(QueryParser.CollectionIteratorContext ctx);
+
 	/**
 	 * Exit a parse tree produced by {@link QueryParser#collectionIterator}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitCollectionIterator(QueryParser.CollectionIteratorContext ctx);
+
 	/**
 	 * Enter a parse tree produced by {@link QueryParser#expressionSequence}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterExpressionSequence(QueryParser.ExpressionSequenceContext ctx);
+
 	/**
 	 * Exit a parse tree produced by {@link QueryParser#expressionSequence}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitExpressionSequence(QueryParser.ExpressionSequenceContext ctx);
+
 	/**
 	 * Enter a parse tree produced by {@link QueryParser#variableDefinition}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterVariableDefinition(QueryParser.VariableDefinitionContext ctx);
+
 	/**
 	 * Exit a parse tree produced by {@link QueryParser#variableDefinition}.
-	 * @param ctx the parse tree
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitVariableDefinition(QueryParser.VariableDefinitionContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code StringLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code StringLit} labeled alternative in
+	 * {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterStringLit(QueryParser.StringLitContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code StringLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code StringLit} labeled alternative in {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitStringLit(QueryParser.StringLitContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code ErrorStringLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code ErrorStringLit} labeled alternative in
+	 * {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterErrorStringLit(QueryParser.ErrorStringLitContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code ErrorStringLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code ErrorStringLit} labeled alternative in
+	 * {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitErrorStringLit(QueryParser.ErrorStringLitContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code IntegerLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code IntegerLit} labeled alternative in
+	 * {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterIntegerLit(QueryParser.IntegerLitContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code IntegerLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code IntegerLit} labeled alternative in
+	 * {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitIntegerLit(QueryParser.IntegerLitContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code RealLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code RealLit} labeled alternative in {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterRealLit(QueryParser.RealLitContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code RealLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code RealLit} labeled alternative in {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitRealLit(QueryParser.RealLitContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code TrueLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code TrueLit} labeled alternative in {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterTrueLit(QueryParser.TrueLitContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code TrueLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code TrueLit} labeled alternative in {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitTrueLit(QueryParser.TrueLitContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code FalseLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code FalseLit} labeled alternative in {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterFalseLit(QueryParser.FalseLitContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code FalseLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code FalseLit} labeled alternative in {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitFalseLit(QueryParser.FalseLitContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code NullLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code NullLit} labeled alternative in {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterNullLit(QueryParser.NullLitContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code NullLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code NullLit} labeled alternative in {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitNullLit(QueryParser.NullLitContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code ExplicitSeqLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code ExplicitSeqLit} labeled alternative in
+	 * {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterExplicitSeqLit(QueryParser.ExplicitSeqLitContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code ExplicitSeqLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code ExplicitSeqLit} labeled alternative in
+	 * {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitExplicitSeqLit(QueryParser.ExplicitSeqLitContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code ExplicitSetLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code ExplicitSetLit} labeled alternative in
+	 * {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterExplicitSetLit(QueryParser.ExplicitSetLitContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code ExplicitSetLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code ExplicitSetLit} labeled alternative in
+	 * {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitExplicitSetLit(QueryParser.ExplicitSetLitContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code EnumLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code EnumLit} labeled alternative in {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterEnumLit(QueryParser.EnumLitContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code EnumLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code EnumLit} labeled alternative in {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitEnumLit(QueryParser.EnumLitContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code ErrorEnumLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code ErrorEnumLit} labeled alternative in
+	 * {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterErrorEnumLit(QueryParser.ErrorEnumLitContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code ErrorEnumLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code ErrorEnumLit} labeled alternative in
+	 * {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitErrorEnumLit(QueryParser.ErrorEnumLitContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code TypeLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code TypeLit} labeled alternative in {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterTypeLit(QueryParser.TypeLitContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code TypeLit}
-	 * labeled alternative in {@link QueryParser#literal}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code TypeLit} labeled alternative in {@link QueryParser#literal}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitTypeLit(QueryParser.TypeLitContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code StrType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code StrType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterStrType(QueryParser.StrTypeContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code StrType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code StrType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitStrType(QueryParser.StrTypeContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code IntType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code IntType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterIntType(QueryParser.IntTypeContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code IntType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code IntType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitIntType(QueryParser.IntTypeContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code RealType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code RealType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterRealType(QueryParser.RealTypeContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code RealType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code RealType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitRealType(QueryParser.RealTypeContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code BooleanType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code BooleanType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterBooleanType(QueryParser.BooleanTypeContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code BooleanType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code BooleanType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitBooleanType(QueryParser.BooleanTypeContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code SeqType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code SeqType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterSeqType(QueryParser.SeqTypeContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code SeqType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code SeqType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitSeqType(QueryParser.SeqTypeContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code SetType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code SetType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterSetType(QueryParser.SetTypeContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code SetType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code SetType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitSetType(QueryParser.SetTypeContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code ClsType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code ClsType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterClsType(QueryParser.ClsTypeContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code ClsType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code ClsType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitClsType(QueryParser.ClsTypeContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code ClassifierSetType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code ClassifierSetType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterClassifierSetType(QueryParser.ClassifierSetTypeContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code ClassifierSetType}
-	 * labeled alternative in {@link QueryParser#typeLiteral}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code ClassifierSetType} labeled alternative in
+	 * {@link QueryParser#typeLiteral}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitClassifierSetType(QueryParser.ClassifierSetTypeContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code ClassifierType}
-	 * labeled alternative in {@link QueryParser#classifierTypeRule}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code ClassifierType} labeled alternative in
+	 * {@link QueryParser#classifierTypeRule}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterClassifierType(QueryParser.ClassifierTypeContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code ClassifierType}
-	 * labeled alternative in {@link QueryParser#classifierTypeRule}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code ClassifierType} labeled alternative in
+	 * {@link QueryParser#classifierTypeRule}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitClassifierType(QueryParser.ClassifierTypeContext ctx);
+
 	/**
-	 * Enter a parse tree produced by the {@code ErrorClassifierType}
-	 * labeled alternative in {@link QueryParser#classifierTypeRule}.
-	 * @param ctx the parse tree
+	 * Enter a parse tree produced by the {@code ErrorClassifierType} labeled alternative in
+	 * {@link QueryParser#classifierTypeRule}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void enterErrorClassifierType(QueryParser.ErrorClassifierTypeContext ctx);
+
 	/**
-	 * Exit a parse tree produced by the {@code ErrorClassifierType}
-	 * labeled alternative in {@link QueryParser#classifierTypeRule}.
-	 * @param ctx the parse tree
+	 * Exit a parse tree produced by the {@code ErrorClassifierType} labeled alternative in
+	 * {@link QueryParser#classifierTypeRule}.
+	 * 
+	 * @param ctx
+	 *            the parse tree
 	 */
 	void exitErrorClassifierType(QueryParser.ErrorClassifierTypeContext ctx);
-}
\ No newline at end of file
+}
diff --git a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryParser.java b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryParser.java
index 33a7e14..8e5c8f3 100644
--- a/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryParser.java
+++ b/query/plugins/org.eclipse.acceleo.query/src-gen/org/eclipse/acceleo/query/parser/QueryParser.java
@@ -11,70 +11,82 @@
  *     Obeo - initial API and implementation
  *******************************************************************************/
 package org.eclipse.acceleo.query.parser;
-  
 
-import org.antlr.v4.runtime.atn.*;
-import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.misc.*;
-import org.antlr.v4.runtime.tree.*;
 import java.util.List;
-import java.util.Iterator;
-import java.util.ArrayList;
 
-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
+import org.antlr.v4.runtime.FailedPredicateException;
+import org.antlr.v4.runtime.NoViableAltException;
+import org.antlr.v4.runtime.Parser;
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.RuleContext;
+import org.antlr.v4.runtime.RuntimeMetaData;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+import org.antlr.v4.runtime.Vocabulary;
+import org.antlr.v4.runtime.VocabularyImpl;
+import org.antlr.v4.runtime.atn.ATN;
+import org.antlr.v4.runtime.atn.ATNDeserializer;
+import org.antlr.v4.runtime.atn.ParserATNSimulator;
+import org.antlr.v4.runtime.atn.PredictionContextCache;
+import org.antlr.v4.runtime.dfa.DFA;
+import org.antlr.v4.runtime.tree.ParseTreeListener;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast" })
 public class QueryParser extends Parser {
-	static { RuntimeMetaData.checkVersion("4.7.2", RuntimeMetaData.VERSION); }
+	static {
+		RuntimeMetaData.checkVersion("4.7.2", RuntimeMetaData.VERSION);
+	}
 
 	protected static final DFA[] _decisionToDFA;
-	protected static final PredictionContextCache _sharedContextCache =
-		new PredictionContextCache();
-	public static final int
-		T__0=1, T__1=2, T__2=3, T__3=4, T__4=5, T__5=6, T__6=7, T__7=8, T__8=9, 
-		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, T__16=17, 
-		T__17=18, T__18=19, T__19=20, T__20=21, T__21=22, T__22=23, T__23=24, 
-		T__24=25, T__25=26, T__26=27, T__27=28, T__28=29, T__29=30, T__30=31, 
-		T__31=32, T__32=33, T__33=34, T__34=35, T__35=36, T__36=37, T__37=38, 
-		T__38=39, T__39=40, T__40=41, T__41=42, T__42=43, T__43=44, T__44=45, 
-		T__45=46, T__46=47, T__47=48, T__48=49, T__49=50, T__50=51, T__51=52, 
-		WS=53, MultOp=54, Integer=55, Real=56, String=57, ErrorString=58, Ident=59;
-	public static final int
-		RULE_entry = 0, RULE_expression = 1, RULE_binding = 2, RULE_addOp = 3, 
-		RULE_compOp = 4, RULE_navigationSegment = 5, RULE_callExp = 6, RULE_lambdaExpression = 7, 
-		RULE_collectionIterator = 8, RULE_expressionSequence = 9, RULE_variableDefinition = 10, 
-		RULE_literal = 11, RULE_typeLiteral = 12, RULE_classifierTypeRule = 13;
+
+	protected static final PredictionContextCache _sharedContextCache = new PredictionContextCache();
+
+	public static final int T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, T__6 = 7, T__7 = 8,
+			T__8 = 9, T__9 = 10, T__10 = 11, T__11 = 12, T__12 = 13, T__13 = 14, T__14 = 15, T__15 = 16,
+			T__16 = 17, T__17 = 18, T__18 = 19, T__19 = 20, T__20 = 21, T__21 = 22, T__22 = 23, T__23 = 24,
+			T__24 = 25, T__25 = 26, T__26 = 27, T__27 = 28, T__28 = 29, T__29 = 30, T__30 = 31, T__31 = 32,
+			T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36, T__36 = 37, T__37 = 38, T__38 = 39, T__39 = 40,
+			T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, T__44 = 45, T__45 = 46, T__46 = 47, T__47 = 48,
+			T__48 = 49, T__49 = 50, T__50 = 51, T__51 = 52, WS = 53, MultOp = 54, Integer = 55, Real = 56,
+			String = 57, ErrorString = 58, Ident = 59;
+
+	public static final int RULE_entry = 0, RULE_expression = 1, RULE_binding = 2, RULE_addOp = 3,
+			RULE_compOp = 4, RULE_navigationSegment = 5, RULE_callExp = 6, RULE_lambdaExpression = 7,
+			RULE_collectionIterator = 8, RULE_expressionSequence = 9, RULE_variableDefinition = 10,
+			RULE_literal = 11, RULE_typeLiteral = 12, RULE_classifierTypeRule = 13;
+
 	private static String[] makeRuleNames() {
-		return new String[] {
-			"entry", "expression", "binding", "addOp", "compOp", "navigationSegment", 
-			"callExp", "lambdaExpression", "collectionIterator", "expressionSequence", 
-			"variableDefinition", "literal", "typeLiteral", "classifierTypeRule"
-		};
+		return new String[] {"entry", "expression", "binding", "addOp", "compOp", "navigationSegment",
+				"callExp", "lambdaExpression", "collectionIterator", "expressionSequence",
+				"variableDefinition", "literal", "typeLiteral", "classifierTypeRule" };
 	}
+
 	public static final String[] ruleNames = makeRuleNames();
 
 	private static String[] makeLiteralNames() {
-		return new String[] {
-			null, "'not'", "'-'", "'and'", "'or'", "'xor'", "'implies'", "'('", "')'", 
-			"'if'", "'then'", "'else'", "'endif'", "'let'", "','", "'in'", "':'", 
-			"'='", "'+'", "'<='", "'>='", "'!='", "'<>'", "'=='", "'<'", "'>'", "'.'", 
-			"'->'", "'select'", "'reject'", "'collect'", "'any'", "'exists'", "'forAll'", 
-			"'isUnique'", "'one'", "'sortedBy'", "'closure'", "'|'", "'true'", "'false'", 
-			"'null'", "'Sequence{'", "'}'", "'OrderedSet{'", "'::'", "'String'", 
-			"'Integer'", "'Real'", "'Boolean'", "'Sequence('", "'OrderedSet('", "'{'"
-		};
+		return new String[] {null, "'not'", "'-'", "'and'", "'or'", "'xor'", "'implies'", "'('", "')'",
+				"'if'", "'then'", "'else'", "'endif'", "'let'", "','", "'in'", "':'", "'='", "'+'", "'<='",
+				"'>='", "'!='", "'<>'", "'=='", "'<'", "'>'", "'.'", "'->'", "'select'", "'reject'",
+				"'collect'", "'any'", "'exists'", "'forAll'", "'isUnique'", "'one'", "'sortedBy'",
+				"'closure'", "'|'", "'true'", "'false'", "'null'", "'Sequence{'", "'}'", "'OrderedSet{'",
+				"'::'", "'String'", "'Integer'", "'Real'", "'Boolean'", "'Sequence('", "'OrderedSet('",
+				"'{'" };
 	}
+
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
+
 	private static String[] makeSymbolicNames() {
-		return new String[] {
-			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, null, null, null, null, null, null, null, 
-			null, null, null, null, null, "WS", "MultOp", "Integer", "Real", "String", 
-			"ErrorString", "Ident"
-		};
+		return new String[] {null, null, null, null, null, null, null, null, null, null, null, null, null,
+				null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+				null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+				null, null, null, null, null, null, null, null, null, null, "WS", "MultOp", "Integer", "Real",
+				"String", "ErrorString", "Ident" };
 	}
+
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
+
 	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
 	/**
@@ -109,38 +121,58 @@
 	}
 
 	@Override
-	public String getGrammarFileName() { return "Query.g4"; }
+	public String getGrammarFileName() {
+		return "Query.g4";
+	}
 
 	@Override
-	public String[] getRuleNames() { return ruleNames; }
+	public String[] getRuleNames() {
+		return ruleNames;
+	}
 
 	@Override
-	public String getSerializedATN() { return _serializedATN; }
+	public String getSerializedATN() {
+		return _serializedATN;
+	}
 
 	@Override
-	public ATN getATN() { return _ATN; }
+	public ATN getATN() {
+		return _ATN;
+	}
 
 	public QueryParser(TokenStream input) {
 		super(input);
-		_interp = new ParserATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
+		_interp = new ParserATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
 	}
 
 	public static class EntryContext extends ParserRuleContext {
 		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
+			return getRuleContext(ExpressionContext.class, 0);
 		}
-		public TerminalNode EOF() { return getToken(QueryParser.EOF, 0); }
+
+		public TerminalNode EOF() {
+			return getToken(QueryParser.EOF, 0);
+		}
+
 		public EntryContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_entry; }
+
+		@Override
+		public int getRuleIndex() {
+			return RULE_entry;
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterEntry(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterEntry(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitEntry(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitEntry(this);
 		}
 	}
 
@@ -150,18 +182,16 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(28);
-			expression(0);
-			setState(29);
-			match(EOF);
+				setState(28);
+				expression(0);
+				setState(29);
+				match(EOF);
 			}
-		}
-		catch (RecognitionException re) {
+		} catch (RecognitionException re) {
 			_localctx.exception = re;
 			_errHandler.reportError(this, re);
 			_errHandler.recover(this, re);
-		}
-		finally {
+		} finally {
 			exitRule();
 		}
 		return _localctx;
@@ -171,259 +201,403 @@
 		public ExpressionContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_expression; }
-	 
-		public ExpressionContext() { }
+
+		@Override
+		public int getRuleIndex() {
+			return RULE_expression;
+		}
+
+		public ExpressionContext() {
+		}
+
 		public void copyFrom(ExpressionContext ctx) {
 			super.copyFrom(ctx);
 		}
 	}
+
 	public static class VarRefContext extends ExpressionContext {
-		public TerminalNode Ident() { return getToken(QueryParser.Ident, 0); }
-		public VarRefContext(ExpressionContext ctx) { copyFrom(ctx); }
+		public TerminalNode Ident() {
+			return getToken(QueryParser.Ident, 0);
+		}
+
+		public VarRefContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterVarRef(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterVarRef(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitVarRef(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitVarRef(this);
 		}
 	}
+
 	public static class AddContext extends ExpressionContext {
 		public List<ExpressionContext> expression() {
 			return getRuleContexts(ExpressionContext.class);
 		}
+
 		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
+			return getRuleContext(ExpressionContext.class, i);
 		}
+
 		public AddOpContext addOp() {
-			return getRuleContext(AddOpContext.class,0);
+			return getRuleContext(AddOpContext.class, 0);
 		}
-		public AddContext(ExpressionContext ctx) { copyFrom(ctx); }
+
+		public AddContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterAdd(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterAdd(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitAdd(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitAdd(this);
 		}
 	}
+
 	public static class NavContext extends ExpressionContext {
 		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
+			return getRuleContext(ExpressionContext.class, 0);
 		}
+
 		public NavigationSegmentContext navigationSegment() {
-			return getRuleContext(NavigationSegmentContext.class,0);
+			return getRuleContext(NavigationSegmentContext.class, 0);
 		}
-		public NavContext(ExpressionContext ctx) { copyFrom(ctx); }
+
+		public NavContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterNav(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterNav(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitNav(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitNav(this);
 		}
 	}
+
 	public static class OrContext extends ExpressionContext {
 		public List<ExpressionContext> expression() {
 			return getRuleContexts(ExpressionContext.class);
 		}
+
 		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
+			return getRuleContext(ExpressionContext.class, i);
 		}
-		public OrContext(ExpressionContext ctx) { copyFrom(ctx); }
+
+		public OrContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterOr(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterOr(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitOr(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitOr(this);
 		}
 	}
+
 	public static class LetExprContext extends ExpressionContext {
 		public List<BindingContext> binding() {
 			return getRuleContexts(BindingContext.class);
 		}
+
 		public BindingContext binding(int i) {
-			return getRuleContext(BindingContext.class,i);
+			return getRuleContext(BindingContext.class, i);
 		}
+
 		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
+			return getRuleContext(ExpressionContext.class, 0);
 		}
-		public LetExprContext(ExpressionContext ctx) { copyFrom(ctx); }
+
+		public LetExprContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterLetExpr(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterLetExpr(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitLetExpr(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitLetExpr(this);
 		}
 	}
+
 	public static class ConditionalContext extends ExpressionContext {
 		public List<ExpressionContext> expression() {
 			return getRuleContexts(ExpressionContext.class);
 		}
+
 		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
+			return getRuleContext(ExpressionContext.class, i);
 		}
-		public ConditionalContext(ExpressionContext ctx) { copyFrom(ctx); }
+
+		public ConditionalContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterConditional(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterConditional(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitConditional(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitConditional(this);
 		}
 	}
+
 	public static class CompContext extends ExpressionContext {
 		public List<ExpressionContext> expression() {
 			return getRuleContexts(ExpressionContext.class);
 		}
+
 		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
+			return getRuleContext(ExpressionContext.class, i);
 		}
+
 		public CompOpContext compOp() {
-			return getRuleContext(CompOpContext.class,0);
+			return getRuleContext(CompOpContext.class, 0);
 		}
-		public CompContext(ExpressionContext ctx) { copyFrom(ctx); }
+
+		public CompContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterComp(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterComp(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitComp(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitComp(this);
 		}
 	}
+
 	public static class NotContext extends ExpressionContext {
 		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
+			return getRuleContext(ExpressionContext.class, 0);
 		}
-		public NotContext(ExpressionContext ctx) { copyFrom(ctx); }
+
+		public NotContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterNot(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterNot(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitNot(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitNot(this);
 		}
 	}
+
 	public static class MinContext extends ExpressionContext {
 		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
+			return getRuleContext(ExpressionContext.class, 0);
 		}
-		public MinContext(ExpressionContext ctx) { copyFrom(ctx); }
+
+		public MinContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterMin(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterMin(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitMin(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitMin(this);
 		}
 	}
+
 	public static class ImpliesContext extends ExpressionContext {
 		public List<ExpressionContext> expression() {
 			return getRuleContexts(ExpressionContext.class);
 		}
+
 		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
+			return getRuleContext(ExpressionContext.class, i);
 		}
-		public ImpliesContext(ExpressionContext ctx) { copyFrom(ctx); }
+
+		public ImpliesContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterImplies(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterImplies(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitImplies(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitImplies(this);
 		}
 	}
+
 	public static class MultContext extends ExpressionContext {
 		public List<ExpressionContext> expression() {
 			return getRuleContexts(ExpressionContext.class);
 		}
+
 		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
+			return getRuleContext(ExpressionContext.class, i);
 		}
-		public TerminalNode MultOp() { return getToken(QueryParser.MultOp, 0); }
-		public MultContext(ExpressionContext ctx) { copyFrom(ctx); }
+
+		public TerminalNode MultOp() {
+			return getToken(QueryParser.MultOp, 0);
+		}
+
+		public MultContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterMult(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterMult(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitMult(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitMult(this);
 		}
 	}
+
 	public static class LitContext extends ExpressionContext {
 		public LiteralContext literal() {
-			return getRuleContext(LiteralContext.class,0);
+			return getRuleContext(LiteralContext.class, 0);
 		}
-		public LitContext(ExpressionContext ctx) { copyFrom(ctx); }
+
+		public LitContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterLit(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitLit(this);
 		}
 	}
+
 	public static class AndContext extends ExpressionContext {
 		public List<ExpressionContext> expression() {
 			return getRuleContexts(ExpressionContext.class);
 		}
+
 		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
+			return getRuleContext(ExpressionContext.class, i);
 		}
-		public AndContext(ExpressionContext ctx) { copyFrom(ctx); }
+
+		public AndContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterAnd(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterAnd(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitAnd(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitAnd(this);
 		}
 	}
+
 	public static class XorContext extends ExpressionContext {
 		public List<ExpressionContext> expression() {
 			return getRuleContexts(ExpressionContext.class);
 		}
+
 		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
+			return getRuleContext(ExpressionContext.class, i);
 		}
-		public XorContext(ExpressionContext ctx) { copyFrom(ctx); }
+
+		public XorContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterXor(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterXor(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitXor(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitXor(this);
 		}
 	}
+
 	public static class ParenContext extends ExpressionContext {
 		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
+			return getRuleContext(ExpressionContext.class, 0);
 		}
-		public ParenContext(ExpressionContext ctx) { copyFrom(ctx); }
+
+		public ParenContext(ExpressionContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterParen(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterParen(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitParen(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitParen(this);
 		}
 	}
 
@@ -443,261 +617,274 @@
 			int _alt;
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(62);
-			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,1,_ctx) ) {
-			case 1:
-				{
-				_localctx = new NotContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
+				setState(62);
+				_errHandler.sync(this);
+				switch (getInterpreter().adaptivePredict(_input, 1, _ctx)) {
+					case 1: {
+						_localctx = new NotContext(_localctx);
+						_ctx = _localctx;
+						_prevctx = _localctx;
 
-				setState(32);
-				match(T__0);
-				setState(33);
-				expression(14);
-				}
-				break;
-			case 2:
-				{
-				_localctx = new MinContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(34);
-				match(T__1);
-				setState(35);
-				expression(13);
-				}
-				break;
-			case 3:
-				{
-				_localctx = new VarRefContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(36);
-				match(Ident);
-				}
-				break;
-			case 4:
-				{
-				_localctx = new LitContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(37);
-				literal();
-				}
-				break;
-			case 5:
-				{
-				_localctx = new ParenContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(38);
-				match(T__6);
-				setState(39);
-				expression(0);
-				setState(40);
-				match(T__7);
-				}
-				break;
-			case 6:
-				{
-				_localctx = new ConditionalContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(42);
-				match(T__8);
-				setState(43);
-				expression(0);
-				setState(44);
-				match(T__9);
-				setState(45);
-				expression(0);
-				setState(46);
-				match(T__10);
-				setState(47);
-				expression(0);
-				setState(48);
-				match(T__11);
-				}
-				break;
-			case 7:
-				{
-				_localctx = new LetExprContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(50);
-				match(T__12);
-				setState(51);
-				binding();
-				setState(56);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				while (_la==T__13) {
-					{
-					{
-					setState(52);
-					match(T__13);
-					setState(53);
-					binding();
+						setState(32);
+						match(T__0);
+						setState(33);
+						expression(14);
 					}
-					}
-					setState(58);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
-				}
-				setState(59);
-				match(T__14);
-				setState(60);
-				expression(1);
-				}
-				break;
-			}
-			_ctx.stop = _input.LT(-1);
-			setState(91);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,3,_ctx);
-			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					if ( _parseListeners!=null ) triggerExitRuleEvent();
-					_prevctx = _localctx;
-					{
-					setState(89);
-					_errHandler.sync(this);
-					switch ( getInterpreter().adaptivePredict(_input,2,_ctx) ) {
-					case 1:
-						{
-						_localctx = new MultContext(new ExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(64);
-						if (!(precpred(_ctx, 12))) throw new FailedPredicateException(this, "precpred(_ctx, 12)");
-						setState(65);
-						match(MultOp);
-						setState(66);
+						break;
+					case 2: {
+						_localctx = new MinContext(_localctx);
+						_ctx = _localctx;
+						_prevctx = _localctx;
+						setState(34);
+						match(T__1);
+						setState(35);
 						expression(13);
-						}
-						break;
-					case 2:
-						{
-						_localctx = new AddContext(new ExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(67);
-						if (!(precpred(_ctx, 11))) throw new FailedPredicateException(this, "precpred(_ctx, 11)");
-						setState(68);
-						addOp();
-						setState(69);
-						expression(12);
-						}
-						break;
-					case 3:
-						{
-						_localctx = new CompContext(new ExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(71);
-						if (!(precpred(_ctx, 10))) throw new FailedPredicateException(this, "precpred(_ctx, 10)");
-						setState(72);
-						compOp();
-						setState(73);
-						expression(11);
-						}
-						break;
-					case 4:
-						{
-						_localctx = new AndContext(new ExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(75);
-						if (!(precpred(_ctx, 9))) throw new FailedPredicateException(this, "precpred(_ctx, 9)");
-						setState(76);
-						match(T__2);
-						setState(77);
-						expression(10);
-						}
-						break;
-					case 5:
-						{
-						_localctx = new OrContext(new ExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(78);
-						if (!(precpred(_ctx, 8))) throw new FailedPredicateException(this, "precpred(_ctx, 8)");
-						setState(79);
-						match(T__3);
-						setState(80);
-						expression(9);
-						}
-						break;
-					case 6:
-						{
-						_localctx = new XorContext(new ExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(81);
-						if (!(precpred(_ctx, 7))) throw new FailedPredicateException(this, "precpred(_ctx, 7)");
-						setState(82);
-						match(T__4);
-						setState(83);
-						expression(8);
-						}
-						break;
-					case 7:
-						{
-						_localctx = new ImpliesContext(new ExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(84);
-						if (!(precpred(_ctx, 6))) throw new FailedPredicateException(this, "precpred(_ctx, 6)");
-						setState(85);
-						match(T__5);
-						setState(86);
-						expression(7);
-						}
-						break;
-					case 8:
-						{
-						_localctx = new NavContext(new ExpressionContext(_parentctx, _parentState));
-						pushNewRecursionContext(_localctx, _startState, RULE_expression);
-						setState(87);
-						if (!(precpred(_ctx, 15))) throw new FailedPredicateException(this, "precpred(_ctx, 15)");
-						setState(88);
-						navigationSegment();
-						}
-						break;
 					}
-					} 
+						break;
+					case 3: {
+						_localctx = new VarRefContext(_localctx);
+						_ctx = _localctx;
+						_prevctx = _localctx;
+						setState(36);
+						match(Ident);
+					}
+						break;
+					case 4: {
+						_localctx = new LitContext(_localctx);
+						_ctx = _localctx;
+						_prevctx = _localctx;
+						setState(37);
+						literal();
+					}
+						break;
+					case 5: {
+						_localctx = new ParenContext(_localctx);
+						_ctx = _localctx;
+						_prevctx = _localctx;
+						setState(38);
+						match(T__6);
+						setState(39);
+						expression(0);
+						setState(40);
+						match(T__7);
+					}
+						break;
+					case 6: {
+						_localctx = new ConditionalContext(_localctx);
+						_ctx = _localctx;
+						_prevctx = _localctx;
+						setState(42);
+						match(T__8);
+						setState(43);
+						expression(0);
+						setState(44);
+						match(T__9);
+						setState(45);
+						expression(0);
+						setState(46);
+						match(T__10);
+						setState(47);
+						expression(0);
+						setState(48);
+						match(T__11);
+					}
+						break;
+					case 7: {
+						_localctx = new LetExprContext(_localctx);
+						_ctx = _localctx;
+						_prevctx = _localctx;
+						setState(50);
+						match(T__12);
+						setState(51);
+						binding();
+						setState(56);
+						_errHandler.sync(this);
+						_la = _input.LA(1);
+						while (_la == T__13) {
+							{
+								{
+									setState(52);
+									match(T__13);
+									setState(53);
+									binding();
+								}
+							}
+							setState(58);
+							_errHandler.sync(this);
+							_la = _input.LA(1);
+						}
+						setState(59);
+						match(T__14);
+						setState(60);
+						expression(1);
+					}
+						break;
 				}
-				setState(93);
+				_ctx.stop = _input.LT(-1);
+				setState(91);
 				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,3,_ctx);
+				_alt = getInterpreter().adaptivePredict(_input, 3, _ctx);
+				while (_alt != 2 && _alt != org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER) {
+					if (_alt == 1) {
+						if (_parseListeners != null)
+							triggerExitRuleEvent();
+						_prevctx = _localctx;
+						{
+							setState(89);
+							_errHandler.sync(this);
+							switch (getInterpreter().adaptivePredict(_input, 2, _ctx)) {
+								case 1: {
+									_localctx = new MultContext(new ExpressionContext(_parentctx,
+											_parentState));
+									pushNewRecursionContext(_localctx, _startState, RULE_expression);
+									setState(64);
+									if (!(precpred(_ctx, 12)))
+										throw new FailedPredicateException(this, "precpred(_ctx, 12)");
+									setState(65);
+									match(MultOp);
+									setState(66);
+									expression(13);
+								}
+									break;
+								case 2: {
+									_localctx = new AddContext(new ExpressionContext(_parentctx,
+											_parentState));
+									pushNewRecursionContext(_localctx, _startState, RULE_expression);
+									setState(67);
+									if (!(precpred(_ctx, 11)))
+										throw new FailedPredicateException(this, "precpred(_ctx, 11)");
+									setState(68);
+									addOp();
+									setState(69);
+									expression(12);
+								}
+									break;
+								case 3: {
+									_localctx = new CompContext(new ExpressionContext(_parentctx,
+											_parentState));
+									pushNewRecursionContext(_localctx, _startState, RULE_expression);
+									setState(71);
+									if (!(precpred(_ctx, 10)))
+										throw new FailedPredicateException(this, "precpred(_ctx, 10)");
+									setState(72);
+									compOp();
+									setState(73);
+									expression(11);
+								}
+									break;
+								case 4: {
+									_localctx = new AndContext(new ExpressionContext(_parentctx,
+											_parentState));
+									pushNewRecursionContext(_localctx, _startState, RULE_expression);
+									setState(75);
+									if (!(precpred(_ctx, 9)))
+										throw new FailedPredicateException(this, "precpred(_ctx, 9)");
+									setState(76);
+									match(T__2);
+									setState(77);
+									expression(10);
+								}
+									break;
+								case 5: {
+									_localctx = new OrContext(new ExpressionContext(_parentctx,
+											_parentState));
+									pushNewRecursionContext(_localctx, _startState, RULE_expression);
+									setState(78);
+									if (!(precpred(_ctx, 8)))
+										throw new FailedPredicateException(this, "precpred(_ctx, 8)");
+									setState(79);
+									match(T__3);
+									setState(80);
+									expression(9);
+								}
+									break;
+								case 6: {
+									_localctx = new XorContext(new ExpressionContext(_parentctx,
+											_parentState));
+									pushNewRecursionContext(_localctx, _startState, RULE_expression);
+									setState(81);
+									if (!(precpred(_ctx, 7)))
+										throw new FailedPredicateException(this, "precpred(_ctx, 7)");
+									setState(82);
+									match(T__4);
+									setState(83);
+									expression(8);
+								}
+									break;
+								case 7: {
+									_localctx = new ImpliesContext(new ExpressionContext(_parentctx,
+											_parentState));
+									pushNewRecursionContext(_localctx, _startState, RULE_expression);
+									setState(84);
+									if (!(precpred(_ctx, 6)))
+										throw new FailedPredicateException(this, "precpred(_ctx, 6)");
+									setState(85);
+									match(T__5);
+									setState(86);
+									expression(7);
+								}
+									break;
+								case 8: {
+									_localctx = new NavContext(new ExpressionContext(_parentctx,
+											_parentState));
+									pushNewRecursionContext(_localctx, _startState, RULE_expression);
+									setState(87);
+									if (!(precpred(_ctx, 15)))
+										throw new FailedPredicateException(this, "precpred(_ctx, 15)");
+									setState(88);
+									navigationSegment();
+								}
+									break;
+							}
+						}
+					}
+					setState(93);
+					_errHandler.sync(this);
+					_alt = getInterpreter().adaptivePredict(_input, 3, _ctx);
+				}
 			}
-			}
-		}
-		catch (RecognitionException re) {
+		} catch (RecognitionException re) {
 			_localctx.exception = re;
 			_errHandler.reportError(this, re);
 			_errHandler.recover(this, re);
-		}
-		finally {
+		} finally {
 			unrollRecursionContexts(_parentctx);
 		}
 		return _localctx;
 	}
 
 	public static class BindingContext extends ParserRuleContext {
-		public TerminalNode Ident() { return getToken(QueryParser.Ident, 0); }
+		public TerminalNode Ident() {
+			return getToken(QueryParser.Ident, 0);
+		}
+
 		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
+			return getRuleContext(ExpressionContext.class, 0);
 		}
+
 		public TypeLiteralContext typeLiteral() {
-			return getRuleContext(TypeLiteralContext.class,0);
+			return getRuleContext(TypeLiteralContext.class, 0);
 		}
+
 		public BindingContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_binding; }
+
+		@Override
+		public int getRuleIndex() {
+			return RULE_binding;
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterBinding(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterBinding(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitBinding(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitBinding(this);
 		}
 	}
 
@@ -708,32 +895,30 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(94);
-			match(Ident);
-			setState(97);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==T__15) {
-				{
-				setState(95);
-				match(T__15);
-				setState(96);
-				typeLiteral();
+				setState(94);
+				match(Ident);
+				setState(97);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+				if (_la == T__15) {
+					{
+						setState(95);
+						match(T__15);
+						setState(96);
+						typeLiteral();
+					}
 				}
-			}
 
-			setState(99);
-			match(T__16);
-			setState(100);
-			expression(0);
+				setState(99);
+				match(T__16);
+				setState(100);
+				expression(0);
 			}
-		}
-		catch (RecognitionException re) {
+		} catch (RecognitionException re) {
 			_localctx.exception = re;
 			_errHandler.reportError(this, re);
 			_errHandler.recover(this, re);
-		}
-		finally {
+		} finally {
 			exitRule();
 		}
 		return _localctx;
@@ -743,14 +928,22 @@
 		public AddOpContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_addOp; }
+
+		@Override
+		public int getRuleIndex() {
+			return RULE_addOp;
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterAddOp(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterAddOp(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitAddOp(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitAddOp(this);
 		}
 	}
 
@@ -761,24 +954,22 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(102);
-			_la = _input.LA(1);
-			if ( !(_la==T__1 || _la==T__17) ) {
-			_errHandler.recoverInline(this);
+				setState(102);
+				_la = _input.LA(1);
+				if (!(_la == T__1 || _la == T__17)) {
+					_errHandler.recoverInline(this);
+				} else {
+					if (_input.LA(1) == Token.EOF)
+						matchedEOF = true;
+					_errHandler.reportMatch(this);
+					consume();
+				}
 			}
-			else {
-				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-				_errHandler.reportMatch(this);
-				consume();
-			}
-			}
-		}
-		catch (RecognitionException re) {
+		} catch (RecognitionException re) {
 			_localctx.exception = re;
 			_errHandler.reportError(this, re);
 			_errHandler.recover(this, re);
-		}
-		finally {
+		} finally {
 			exitRule();
 		}
 		return _localctx;
@@ -788,14 +979,22 @@
 		public CompOpContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_compOp; }
+
+		@Override
+		public int getRuleIndex() {
+			return RULE_compOp;
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterCompOp(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterCompOp(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitCompOp(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitCompOp(this);
 		}
 	}
 
@@ -806,24 +1005,24 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(104);
-			_la = _input.LA(1);
-			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__16) | (1L << T__18) | (1L << T__19) | (1L << T__20) | (1L << T__21) | (1L << T__22) | (1L << T__23) | (1L << T__24))) != 0)) ) {
-			_errHandler.recoverInline(this);
+				setState(104);
+				_la = _input.LA(1);
+				if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__16) | (1L << T__18) | (1L << T__19)
+						| (1L << T__20) | (1L << T__21) | (1L << T__22) | (1L << T__23)
+						| (1L << T__24))) != 0))) {
+					_errHandler.recoverInline(this);
+				} else {
+					if (_input.LA(1) == Token.EOF)
+						matchedEOF = true;
+					_errHandler.reportMatch(this);
+					consume();
+				}
 			}
-			else {
-				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-				_errHandler.reportMatch(this);
-				consume();
-			}
-			}
-		}
-		catch (RecognitionException re) {
+		} catch (RecognitionException re) {
 			_localctx.exception = re;
 			_errHandler.reportError(this, re);
 			_errHandler.recover(this, re);
-		}
-		finally {
+		} finally {
 			exitRule();
 		}
 		return _localctx;
@@ -833,51 +1032,83 @@
 		public NavigationSegmentContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_navigationSegment; }
-	 
-		public NavigationSegmentContext() { }
+
+		@Override
+		public int getRuleIndex() {
+			return RULE_navigationSegment;
+		}
+
+		public NavigationSegmentContext() {
+		}
+
 		public void copyFrom(NavigationSegmentContext ctx) {
 			super.copyFrom(ctx);
 		}
 	}
+
 	public static class CallOrApplyContext extends NavigationSegmentContext {
 		public CallExpContext callExp() {
-			return getRuleContext(CallExpContext.class,0);
+			return getRuleContext(CallExpContext.class, 0);
 		}
-		public CallOrApplyContext(NavigationSegmentContext ctx) { copyFrom(ctx); }
+
+		public CallOrApplyContext(NavigationSegmentContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterCallOrApply(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterCallOrApply(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitCallOrApply(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitCallOrApply(this);
 		}
 	}
+
 	public static class CollectionCallContext extends NavigationSegmentContext {
 		public CallExpContext callExp() {
-			return getRuleContext(CallExpContext.class,0);
+			return getRuleContext(CallExpContext.class, 0);
 		}
-		public CollectionCallContext(NavigationSegmentContext ctx) { copyFrom(ctx); }
+
+		public CollectionCallContext(NavigationSegmentContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterCollectionCall(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterCollectionCall(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitCollectionCall(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitCollectionCall(this);
 		}
 	}
+
 	public static class FeatureContext extends NavigationSegmentContext {
-		public TerminalNode Ident() { return getToken(QueryParser.Ident, 0); }
-		public FeatureContext(NavigationSegmentContext ctx) { copyFrom(ctx); }
+		public TerminalNode Ident() {
+			return getToken(QueryParser.Ident, 0);
+		}
+
+		public FeatureContext(NavigationSegmentContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterFeature(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterFeature(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitFeature(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitFeature(this);
 		}
 	}
 
@@ -887,45 +1118,40 @@
 		try {
 			setState(112);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,5,_ctx) ) {
-			case 1:
-				_localctx = new FeatureContext(_localctx);
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(106);
-				match(T__25);
-				setState(107);
-				match(Ident);
+			switch (getInterpreter().adaptivePredict(_input, 5, _ctx)) {
+				case 1:
+					_localctx = new FeatureContext(_localctx);
+					enterOuterAlt(_localctx, 1); {
+					setState(106);
+					match(T__25);
+					setState(107);
+					match(Ident);
 				}
-				break;
-			case 2:
-				_localctx = new CallOrApplyContext(_localctx);
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(108);
-				match(T__25);
-				setState(109);
-				callExp();
+					break;
+				case 2:
+					_localctx = new CallOrApplyContext(_localctx);
+					enterOuterAlt(_localctx, 2); {
+					setState(108);
+					match(T__25);
+					setState(109);
+					callExp();
 				}
-				break;
-			case 3:
-				_localctx = new CollectionCallContext(_localctx);
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(110);
-				match(T__26);
-				setState(111);
-				callExp();
+					break;
+				case 3:
+					_localctx = new CollectionCallContext(_localctx);
+					enterOuterAlt(_localctx, 3); {
+					setState(110);
+					match(T__26);
+					setState(111);
+					callExp();
 				}
-				break;
+					break;
 			}
-		}
-		catch (RecognitionException re) {
+		} catch (RecognitionException re) {
 			_localctx.exception = re;
 			_errHandler.reportError(this, re);
 			_errHandler.recover(this, re);
-		}
-		finally {
+		} finally {
 			exitRule();
 		}
 		return _localctx;
@@ -935,46 +1161,73 @@
 		public CallExpContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_callExp; }
-	 
-		public CallExpContext() { }
+
+		@Override
+		public int getRuleIndex() {
+			return RULE_callExp;
+		}
+
+		public CallExpContext() {
+		}
+
 		public void copyFrom(CallExpContext ctx) {
 			super.copyFrom(ctx);
 		}
 	}
+
 	public static class ServiceCallContext extends CallExpContext {
-		public TerminalNode Ident() { return getToken(QueryParser.Ident, 0); }
-		public ExpressionSequenceContext expressionSequence() {
-			return getRuleContext(ExpressionSequenceContext.class,0);
+		public TerminalNode Ident() {
+			return getToken(QueryParser.Ident, 0);
 		}
-		public ServiceCallContext(CallExpContext ctx) { copyFrom(ctx); }
+
+		public ExpressionSequenceContext expressionSequence() {
+			return getRuleContext(ExpressionSequenceContext.class, 0);
+		}
+
+		public ServiceCallContext(CallExpContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterServiceCall(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterServiceCall(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitServiceCall(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitServiceCall(this);
 		}
 	}
+
 	public static class IterationCallContext extends CallExpContext {
 		public CollectionIteratorContext collectionIterator() {
-			return getRuleContext(CollectionIteratorContext.class,0);
+			return getRuleContext(CollectionIteratorContext.class, 0);
 		}
+
 		public VariableDefinitionContext variableDefinition() {
-			return getRuleContext(VariableDefinitionContext.class,0);
+			return getRuleContext(VariableDefinitionContext.class, 0);
 		}
+
 		public LambdaExpressionContext lambdaExpression() {
-			return getRuleContext(LambdaExpressionContext.class,0);
+			return getRuleContext(LambdaExpressionContext.class, 0);
 		}
-		public IterationCallContext(CallExpContext ctx) { copyFrom(ctx); }
+
+		public IterationCallContext(CallExpContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterIterationCall(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterIterationCall(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitIterationCall(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitIterationCall(this);
 		}
 	}
 
@@ -985,55 +1238,51 @@
 			setState(125);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
-			case T__27:
-			case T__28:
-			case T__29:
-			case T__30:
-			case T__31:
-			case T__32:
-			case T__33:
-			case T__34:
-			case T__35:
-			case T__36:
-				_localctx = new IterationCallContext(_localctx);
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(114);
-				collectionIterator();
-				setState(115);
-				match(T__6);
-				setState(116);
-				variableDefinition();
-				setState(117);
-				lambdaExpression();
-				setState(118);
-				match(T__7);
+				case T__27:
+				case T__28:
+				case T__29:
+				case T__30:
+				case T__31:
+				case T__32:
+				case T__33:
+				case T__34:
+				case T__35:
+				case T__36:
+					_localctx = new IterationCallContext(_localctx);
+					enterOuterAlt(_localctx, 1); {
+					setState(114);
+					collectionIterator();
+					setState(115);
+					match(T__6);
+					setState(116);
+					variableDefinition();
+					setState(117);
+					lambdaExpression();
+					setState(118);
+					match(T__7);
 				}
-				break;
-			case Ident:
-				_localctx = new ServiceCallContext(_localctx);
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(120);
-				match(Ident);
-				setState(121);
-				match(T__6);
-				setState(122);
-				expressionSequence();
-				setState(123);
-				match(T__7);
+					break;
+				case Ident:
+					_localctx = new ServiceCallContext(_localctx);
+					enterOuterAlt(_localctx, 2); {
+					setState(120);
+					match(Ident);
+					setState(121);
+					match(T__6);
+					setState(122);
+					expressionSequence();
+					setState(123);
+					match(T__7);
 				}
-				break;
-			default:
-				throw new NoViableAltException(this);
+					break;
+				default:
+					throw new NoViableAltException(this);
 			}
-		}
-		catch (RecognitionException re) {
+		} catch (RecognitionException re) {
 			_localctx.exception = re;
 			_errHandler.reportError(this, re);
 			_errHandler.recover(this, re);
-		}
-		finally {
+		} finally {
 			exitRule();
 		}
 		return _localctx;
@@ -1041,19 +1290,28 @@
 
 	public static class LambdaExpressionContext extends ParserRuleContext {
 		public ExpressionContext expression() {
-			return getRuleContext(ExpressionContext.class,0);
+			return getRuleContext(ExpressionContext.class, 0);
 		}
+
 		public LambdaExpressionContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_lambdaExpression; }
+
+		@Override
+		public int getRuleIndex() {
+			return RULE_lambdaExpression;
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterLambdaExpression(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterLambdaExpression(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitLambdaExpression(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitLambdaExpression(this);
 		}
 	}
 
@@ -1063,16 +1321,14 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(127);
-			expression(0);
+				setState(127);
+				expression(0);
 			}
-		}
-		catch (RecognitionException re) {
+		} catch (RecognitionException re) {
 			_localctx.exception = re;
 			_errHandler.reportError(this, re);
 			_errHandler.recover(this, re);
-		}
-		finally {
+		} finally {
 			exitRule();
 		}
 		return _localctx;
@@ -1082,14 +1338,22 @@
 		public CollectionIteratorContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_collectionIterator; }
+
+		@Override
+		public int getRuleIndex() {
+			return RULE_collectionIterator;
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterCollectionIterator(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterCollectionIterator(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitCollectionIterator(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitCollectionIterator(this);
 		}
 	}
 
@@ -1100,24 +1364,24 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(129);
-			_la = _input.LA(1);
-			if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__27) | (1L << T__28) | (1L << T__29) | (1L << T__30) | (1L << T__31) | (1L << T__32) | (1L << T__33) | (1L << T__34) | (1L << T__35) | (1L << T__36))) != 0)) ) {
-			_errHandler.recoverInline(this);
+				setState(129);
+				_la = _input.LA(1);
+				if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__27) | (1L << T__28) | (1L << T__29)
+						| (1L << T__30) | (1L << T__31) | (1L << T__32) | (1L << T__33) | (1L << T__34)
+						| (1L << T__35) | (1L << T__36))) != 0))) {
+					_errHandler.recoverInline(this);
+				} else {
+					if (_input.LA(1) == Token.EOF)
+						matchedEOF = true;
+					_errHandler.reportMatch(this);
+					consume();
+				}
 			}
-			else {
-				if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-				_errHandler.reportMatch(this);
-				consume();
-			}
-			}
-		}
-		catch (RecognitionException re) {
+		} catch (RecognitionException re) {
 			_localctx.exception = re;
 			_errHandler.reportError(this, re);
 			_errHandler.recover(this, re);
-		}
-		finally {
+		} finally {
 			exitRule();
 		}
 		return _localctx;
@@ -1127,20 +1391,30 @@
 		public List<ExpressionContext> expression() {
 			return getRuleContexts(ExpressionContext.class);
 		}
+
 		public ExpressionContext expression(int i) {
-			return getRuleContext(ExpressionContext.class,i);
+			return getRuleContext(ExpressionContext.class, i);
 		}
+
 		public ExpressionSequenceContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_expressionSequence; }
+
+		@Override
+		public int getRuleIndex() {
+			return RULE_expressionSequence;
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterExpressionSequence(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterExpressionSequence(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitExpressionSequence(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitExpressionSequence(this);
 		}
 	}
 
@@ -1151,61 +1425,75 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(139);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__0) | (1L << T__1) | (1L << T__6) | (1L << T__8) | (1L << T__12) | (1L << T__38) | (1L << T__39) | (1L << T__40) | (1L << T__41) | (1L << T__43) | (1L << T__45) | (1L << T__46) | (1L << T__47) | (1L << T__48) | (1L << T__49) | (1L << T__50) | (1L << T__51) | (1L << Integer) | (1L << Real) | (1L << String) | (1L << ErrorString) | (1L << Ident))) != 0)) {
-				{
-				setState(131);
-				expression(0);
-				setState(136);
+				setState(139);
 				_errHandler.sync(this);
 				_la = _input.LA(1);
-				while (_la==T__13) {
+				if ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__0) | (1L << T__1) | (1L << T__6)
+						| (1L << T__8) | (1L << T__12) | (1L << T__38) | (1L << T__39) | (1L << T__40)
+						| (1L << T__41) | (1L << T__43) | (1L << T__45) | (1L << T__46) | (1L << T__47)
+						| (1L << T__48) | (1L << T__49) | (1L << T__50) | (1L << T__51) | (1L << Integer)
+						| (1L << Real) | (1L << String) | (1L << ErrorString) | (1L << Ident))) != 0)) {
 					{
-					{
-					setState(132);
-					match(T__13);
-					setState(133);
-					expression(0);
+						setState(131);
+						expression(0);
+						setState(136);
+						_errHandler.sync(this);
+						_la = _input.LA(1);
+						while (_la == T__13) {
+							{
+								{
+									setState(132);
+									match(T__13);
+									setState(133);
+									expression(0);
+								}
+							}
+							setState(138);
+							_errHandler.sync(this);
+							_la = _input.LA(1);
+						}
 					}
-					}
-					setState(138);
-					_errHandler.sync(this);
-					_la = _input.LA(1);
 				}
-				}
-			}
 
 			}
-		}
-		catch (RecognitionException re) {
+		} catch (RecognitionException re) {
 			_localctx.exception = re;
 			_errHandler.reportError(this, re);
 			_errHandler.recover(this, re);
-		}
-		finally {
+		} finally {
 			exitRule();
 		}
 		return _localctx;
 	}
 
 	public static class VariableDefinitionContext extends ParserRuleContext {
-		public TerminalNode Ident() { return getToken(QueryParser.Ident, 0); }
-		public TypeLiteralContext typeLiteral() {
-			return getRuleContext(TypeLiteralContext.class,0);
+		public TerminalNode Ident() {
+			return getToken(QueryParser.Ident, 0);
 		}
+
+		public TypeLiteralContext typeLiteral() {
+			return getRuleContext(TypeLiteralContext.class, 0);
+		}
+
 		public VariableDefinitionContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_variableDefinition; }
+
+		@Override
+		public int getRuleIndex() {
+			return RULE_variableDefinition;
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterVariableDefinition(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterVariableDefinition(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitVariableDefinition(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitVariableDefinition(this);
 		}
 	}
 
@@ -1216,30 +1504,28 @@
 		try {
 			enterOuterAlt(_localctx, 1);
 			{
-			setState(141);
-			match(Ident);
-			setState(144);
-			_errHandler.sync(this);
-			_la = _input.LA(1);
-			if (_la==T__15) {
-				{
-				setState(142);
-				match(T__15);
-				setState(143);
-				typeLiteral();
+				setState(141);
+				match(Ident);
+				setState(144);
+				_errHandler.sync(this);
+				_la = _input.LA(1);
+				if (_la == T__15) {
+					{
+						setState(142);
+						match(T__15);
+						setState(143);
+						typeLiteral();
+					}
 				}
-			}
 
-			setState(146);
-			match(T__37);
+				setState(146);
+				match(T__37);
 			}
-		}
-		catch (RecognitionException re) {
+		} catch (RecognitionException re) {
 			_localctx.exception = re;
 			_errHandler.reportError(this, re);
 			_errHandler.recover(this, re);
-		}
-		finally {
+		} finally {
 			exitRule();
 		}
 		return _localctx;
@@ -1249,164 +1535,277 @@
 		public LiteralContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_literal; }
-	 
-		public LiteralContext() { }
+
+		@Override
+		public int getRuleIndex() {
+			return RULE_literal;
+		}
+
+		public LiteralContext() {
+		}
+
 		public void copyFrom(LiteralContext ctx) {
 			super.copyFrom(ctx);
 		}
 	}
+
 	public static class EnumLitContext extends LiteralContext {
-		public List<TerminalNode> Ident() { return getTokens(QueryParser.Ident); }
+		public List<TerminalNode> Ident() {
+			return getTokens(QueryParser.Ident);
+		}
+
 		public TerminalNode Ident(int i) {
 			return getToken(QueryParser.Ident, i);
 		}
-		public EnumLitContext(LiteralContext ctx) { copyFrom(ctx); }
+
+		public EnumLitContext(LiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterEnumLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterEnumLit(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitEnumLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitEnumLit(this);
 		}
 	}
+
 	public static class NullLitContext extends LiteralContext {
-		public NullLitContext(LiteralContext ctx) { copyFrom(ctx); }
+		public NullLitContext(LiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterNullLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterNullLit(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitNullLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitNullLit(this);
 		}
 	}
+
 	public static class TypeLitContext extends LiteralContext {
 		public TypeLiteralContext typeLiteral() {
-			return getRuleContext(TypeLiteralContext.class,0);
+			return getRuleContext(TypeLiteralContext.class, 0);
 		}
-		public TypeLitContext(LiteralContext ctx) { copyFrom(ctx); }
+
+		public TypeLitContext(LiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterTypeLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterTypeLit(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitTypeLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitTypeLit(this);
 		}
 	}
+
 	public static class IntegerLitContext extends LiteralContext {
-		public TerminalNode Integer() { return getToken(QueryParser.Integer, 0); }
-		public IntegerLitContext(LiteralContext ctx) { copyFrom(ctx); }
+		public TerminalNode Integer() {
+			return getToken(QueryParser.Integer, 0);
+		}
+
+		public IntegerLitContext(LiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterIntegerLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterIntegerLit(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitIntegerLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitIntegerLit(this);
 		}
 	}
+
 	public static class RealLitContext extends LiteralContext {
-		public TerminalNode Real() { return getToken(QueryParser.Real, 0); }
-		public RealLitContext(LiteralContext ctx) { copyFrom(ctx); }
+		public TerminalNode Real() {
+			return getToken(QueryParser.Real, 0);
+		}
+
+		public RealLitContext(LiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterRealLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterRealLit(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitRealLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitRealLit(this);
 		}
 	}
+
 	public static class ErrorEnumLitContext extends LiteralContext {
-		public List<TerminalNode> Ident() { return getTokens(QueryParser.Ident); }
+		public List<TerminalNode> Ident() {
+			return getTokens(QueryParser.Ident);
+		}
+
 		public TerminalNode Ident(int i) {
 			return getToken(QueryParser.Ident, i);
 		}
-		public ErrorEnumLitContext(LiteralContext ctx) { copyFrom(ctx); }
+
+		public ErrorEnumLitContext(LiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterErrorEnumLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterErrorEnumLit(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitErrorEnumLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitErrorEnumLit(this);
 		}
 	}
+
 	public static class FalseLitContext extends LiteralContext {
-		public FalseLitContext(LiteralContext ctx) { copyFrom(ctx); }
+		public FalseLitContext(LiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterFalseLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterFalseLit(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitFalseLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitFalseLit(this);
 		}
 	}
+
 	public static class TrueLitContext extends LiteralContext {
-		public TrueLitContext(LiteralContext ctx) { copyFrom(ctx); }
+		public TrueLitContext(LiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterTrueLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterTrueLit(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitTrueLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitTrueLit(this);
 		}
 	}
+
 	public static class ExplicitSetLitContext extends LiteralContext {
 		public ExpressionSequenceContext expressionSequence() {
-			return getRuleContext(ExpressionSequenceContext.class,0);
+			return getRuleContext(ExpressionSequenceContext.class, 0);
 		}
-		public ExplicitSetLitContext(LiteralContext ctx) { copyFrom(ctx); }
+
+		public ExplicitSetLitContext(LiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterExplicitSetLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterExplicitSetLit(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitExplicitSetLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitExplicitSetLit(this);
 		}
 	}
+
 	public static class ExplicitSeqLitContext extends LiteralContext {
 		public ExpressionSequenceContext expressionSequence() {
-			return getRuleContext(ExpressionSequenceContext.class,0);
+			return getRuleContext(ExpressionSequenceContext.class, 0);
 		}
-		public ExplicitSeqLitContext(LiteralContext ctx) { copyFrom(ctx); }
+
+		public ExplicitSeqLitContext(LiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterExplicitSeqLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterExplicitSeqLit(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitExplicitSeqLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitExplicitSeqLit(this);
 		}
 	}
+
 	public static class ErrorStringLitContext extends LiteralContext {
-		public TerminalNode ErrorString() { return getToken(QueryParser.ErrorString, 0); }
-		public ErrorStringLitContext(LiteralContext ctx) { copyFrom(ctx); }
+		public TerminalNode ErrorString() {
+			return getToken(QueryParser.ErrorString, 0);
+		}
+
+		public ErrorStringLitContext(LiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterErrorStringLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterErrorStringLit(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitErrorStringLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitErrorStringLit(this);
 		}
 	}
+
 	public static class StringLitContext extends LiteralContext {
-		public TerminalNode String() { return getToken(QueryParser.String, 0); }
-		public StringLitContext(LiteralContext ctx) { copyFrom(ctx); }
+		public TerminalNode String() {
+			return getToken(QueryParser.String, 0);
+		}
+
+		public StringLitContext(LiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterStringLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterStringLit(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitStringLit(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitStringLit(this);
 		}
 	}
 
@@ -1416,133 +1815,119 @@
 		try {
 			setState(173);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,10,_ctx) ) {
-			case 1:
-				_localctx = new StringLitContext(_localctx);
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(148);
-				match(String);
+			switch (getInterpreter().adaptivePredict(_input, 10, _ctx)) {
+				case 1:
+					_localctx = new StringLitContext(_localctx);
+					enterOuterAlt(_localctx, 1); {
+					setState(148);
+					match(String);
 				}
-				break;
-			case 2:
-				_localctx = new ErrorStringLitContext(_localctx);
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(149);
-				match(ErrorString);
+					break;
+				case 2:
+					_localctx = new ErrorStringLitContext(_localctx);
+					enterOuterAlt(_localctx, 2); {
+					setState(149);
+					match(ErrorString);
 				}
-				break;
-			case 3:
-				_localctx = new IntegerLitContext(_localctx);
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(150);
-				match(Integer);
+					break;
+				case 3:
+					_localctx = new IntegerLitContext(_localctx);
+					enterOuterAlt(_localctx, 3); {
+					setState(150);
+					match(Integer);
 				}
-				break;
-			case 4:
-				_localctx = new RealLitContext(_localctx);
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(151);
-				match(Real);
+					break;
+				case 4:
+					_localctx = new RealLitContext(_localctx);
+					enterOuterAlt(_localctx, 4); {
+					setState(151);
+					match(Real);
 				}
-				break;
-			case 5:
-				_localctx = new TrueLitContext(_localctx);
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(152);
-				match(T__38);
+					break;
+				case 5:
+					_localctx = new TrueLitContext(_localctx);
+					enterOuterAlt(_localctx, 5); {
+					setState(152);
+					match(T__38);
 				}
-				break;
-			case 6:
-				_localctx = new FalseLitContext(_localctx);
-				enterOuterAlt(_localctx, 6);
-				{
-				setState(153);
-				match(T__39);
+					break;
+				case 6:
+					_localctx = new FalseLitContext(_localctx);
+					enterOuterAlt(_localctx, 6); {
+					setState(153);
+					match(T__39);
 				}
-				break;
-			case 7:
-				_localctx = new NullLitContext(_localctx);
-				enterOuterAlt(_localctx, 7);
-				{
-				setState(154);
-				match(T__40);
+					break;
+				case 7:
+					_localctx = new NullLitContext(_localctx);
+					enterOuterAlt(_localctx, 7); {
+					setState(154);
+					match(T__40);
 				}
-				break;
-			case 8:
-				_localctx = new ExplicitSeqLitContext(_localctx);
-				enterOuterAlt(_localctx, 8);
-				{
-				setState(155);
-				match(T__41);
-				setState(156);
-				expressionSequence();
-				setState(157);
-				match(T__42);
+					break;
+				case 8:
+					_localctx = new ExplicitSeqLitContext(_localctx);
+					enterOuterAlt(_localctx, 8); {
+					setState(155);
+					match(T__41);
+					setState(156);
+					expressionSequence();
+					setState(157);
+					match(T__42);
 				}
-				break;
-			case 9:
-				_localctx = new ExplicitSetLitContext(_localctx);
-				enterOuterAlt(_localctx, 9);
-				{
-				setState(159);
-				match(T__43);
-				setState(160);
-				expressionSequence();
-				setState(161);
-				match(T__42);
+					break;
+				case 9:
+					_localctx = new ExplicitSetLitContext(_localctx);
+					enterOuterAlt(_localctx, 9); {
+					setState(159);
+					match(T__43);
+					setState(160);
+					expressionSequence();
+					setState(161);
+					match(T__42);
 				}
-				break;
-			case 10:
-				_localctx = new EnumLitContext(_localctx);
-				enterOuterAlt(_localctx, 10);
-				{
-				setState(163);
-				match(Ident);
-				setState(164);
-				match(T__44);
-				setState(165);
-				match(Ident);
-				setState(166);
-				match(T__44);
-				setState(167);
-				match(Ident);
+					break;
+				case 10:
+					_localctx = new EnumLitContext(_localctx);
+					enterOuterAlt(_localctx, 10); {
+					setState(163);
+					match(Ident);
+					setState(164);
+					match(T__44);
+					setState(165);
+					match(Ident);
+					setState(166);
+					match(T__44);
+					setState(167);
+					match(Ident);
 				}
-				break;
-			case 11:
-				_localctx = new ErrorEnumLitContext(_localctx);
-				enterOuterAlt(_localctx, 11);
-				{
-				setState(168);
-				match(Ident);
-				setState(169);
-				match(T__44);
-				setState(170);
-				match(Ident);
-				setState(171);
-				match(T__15);
+					break;
+				case 11:
+					_localctx = new ErrorEnumLitContext(_localctx);
+					enterOuterAlt(_localctx, 11); {
+					setState(168);
+					match(Ident);
+					setState(169);
+					match(T__44);
+					setState(170);
+					match(Ident);
+					setState(171);
+					match(T__15);
 				}
-				break;
-			case 12:
-				_localctx = new TypeLitContext(_localctx);
-				enterOuterAlt(_localctx, 12);
-				{
-				setState(172);
-				typeLiteral();
+					break;
+				case 12:
+					_localctx = new TypeLitContext(_localctx);
+					enterOuterAlt(_localctx, 12); {
+					setState(172);
+					typeLiteral();
 				}
-				break;
+					break;
 			}
-		}
-		catch (RecognitionException re) {
+		} catch (RecognitionException re) {
 			_localctx.exception = re;
 			_errHandler.reportError(this, re);
 			_errHandler.recover(this, re);
-		}
-		finally {
+		} finally {
 			exitRule();
 		}
 		return _localctx;
@@ -1552,114 +1937,181 @@
 		public TypeLiteralContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_typeLiteral; }
-	 
-		public TypeLiteralContext() { }
+
+		@Override
+		public int getRuleIndex() {
+			return RULE_typeLiteral;
+		}
+
+		public TypeLiteralContext() {
+		}
+
 		public void copyFrom(TypeLiteralContext ctx) {
 			super.copyFrom(ctx);
 		}
 	}
+
 	public static class ClassifierSetTypeContext extends TypeLiteralContext {
 		public List<ClassifierTypeRuleContext> classifierTypeRule() {
 			return getRuleContexts(ClassifierTypeRuleContext.class);
 		}
+
 		public ClassifierTypeRuleContext classifierTypeRule(int i) {
-			return getRuleContext(ClassifierTypeRuleContext.class,i);
+			return getRuleContext(ClassifierTypeRuleContext.class, i);
 		}
-		public ClassifierSetTypeContext(TypeLiteralContext ctx) { copyFrom(ctx); }
+
+		public ClassifierSetTypeContext(TypeLiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterClassifierSetType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterClassifierSetType(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitClassifierSetType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitClassifierSetType(this);
 		}
 	}
+
 	public static class SetTypeContext extends TypeLiteralContext {
 		public TypeLiteralContext typeLiteral() {
-			return getRuleContext(TypeLiteralContext.class,0);
+			return getRuleContext(TypeLiteralContext.class, 0);
 		}
-		public SetTypeContext(TypeLiteralContext ctx) { copyFrom(ctx); }
+
+		public SetTypeContext(TypeLiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterSetType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterSetType(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitSetType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitSetType(this);
 		}
 	}
+
 	public static class SeqTypeContext extends TypeLiteralContext {
 		public TypeLiteralContext typeLiteral() {
-			return getRuleContext(TypeLiteralContext.class,0);
+			return getRuleContext(TypeLiteralContext.class, 0);
 		}
-		public SeqTypeContext(TypeLiteralContext ctx) { copyFrom(ctx); }
+
+		public SeqTypeContext(TypeLiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterSeqType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterSeqType(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitSeqType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitSeqType(this);
 		}
 	}
+
 	public static class BooleanTypeContext extends TypeLiteralContext {
-		public BooleanTypeContext(TypeLiteralContext ctx) { copyFrom(ctx); }
+		public BooleanTypeContext(TypeLiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterBooleanType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterBooleanType(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitBooleanType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitBooleanType(this);
 		}
 	}
+
 	public static class RealTypeContext extends TypeLiteralContext {
-		public RealTypeContext(TypeLiteralContext ctx) { copyFrom(ctx); }
+		public RealTypeContext(TypeLiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterRealType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterRealType(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitRealType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitRealType(this);
 		}
 	}
+
 	public static class ClsTypeContext extends TypeLiteralContext {
 		public ClassifierTypeRuleContext classifierTypeRule() {
-			return getRuleContext(ClassifierTypeRuleContext.class,0);
+			return getRuleContext(ClassifierTypeRuleContext.class, 0);
 		}
-		public ClsTypeContext(TypeLiteralContext ctx) { copyFrom(ctx); }
+
+		public ClsTypeContext(TypeLiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterClsType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterClsType(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitClsType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitClsType(this);
 		}
 	}
+
 	public static class StrTypeContext extends TypeLiteralContext {
-		public StrTypeContext(TypeLiteralContext ctx) { copyFrom(ctx); }
+		public StrTypeContext(TypeLiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterStrType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterStrType(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitStrType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitStrType(this);
 		}
 	}
+
 	public static class IntTypeContext extends TypeLiteralContext {
-		public IntTypeContext(TypeLiteralContext ctx) { copyFrom(ctx); }
+		public IntTypeContext(TypeLiteralContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterIntType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterIntType(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitIntType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitIntType(this);
 		}
 	}
 
@@ -1671,108 +2123,98 @@
 			setState(199);
 			_errHandler.sync(this);
 			switch (_input.LA(1)) {
-			case T__45:
-				_localctx = new StrTypeContext(_localctx);
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(175);
-				match(T__45);
+				case T__45:
+					_localctx = new StrTypeContext(_localctx);
+					enterOuterAlt(_localctx, 1); {
+					setState(175);
+					match(T__45);
 				}
-				break;
-			case T__46:
-				_localctx = new IntTypeContext(_localctx);
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(176);
-				match(T__46);
+					break;
+				case T__46:
+					_localctx = new IntTypeContext(_localctx);
+					enterOuterAlt(_localctx, 2); {
+					setState(176);
+					match(T__46);
 				}
-				break;
-			case T__47:
-				_localctx = new RealTypeContext(_localctx);
-				enterOuterAlt(_localctx, 3);
-				{
-				setState(177);
-				match(T__47);
+					break;
+				case T__47:
+					_localctx = new RealTypeContext(_localctx);
+					enterOuterAlt(_localctx, 3); {
+					setState(177);
+					match(T__47);
 				}
-				break;
-			case T__48:
-				_localctx = new BooleanTypeContext(_localctx);
-				enterOuterAlt(_localctx, 4);
-				{
-				setState(178);
-				match(T__48);
+					break;
+				case T__48:
+					_localctx = new BooleanTypeContext(_localctx);
+					enterOuterAlt(_localctx, 4); {
+					setState(178);
+					match(T__48);
 				}
-				break;
-			case T__49:
-				_localctx = new SeqTypeContext(_localctx);
-				enterOuterAlt(_localctx, 5);
-				{
-				setState(179);
-				match(T__49);
-				setState(180);
-				typeLiteral();
-				setState(181);
-				match(T__7);
+					break;
+				case T__49:
+					_localctx = new SeqTypeContext(_localctx);
+					enterOuterAlt(_localctx, 5); {
+					setState(179);
+					match(T__49);
+					setState(180);
+					typeLiteral();
+					setState(181);
+					match(T__7);
 				}
-				break;
-			case T__50:
-				_localctx = new SetTypeContext(_localctx);
-				enterOuterAlt(_localctx, 6);
-				{
-				setState(183);
-				match(T__50);
-				setState(184);
-				typeLiteral();
-				setState(185);
-				match(T__7);
+					break;
+				case T__50:
+					_localctx = new SetTypeContext(_localctx);
+					enterOuterAlt(_localctx, 6); {
+					setState(183);
+					match(T__50);
+					setState(184);
+					typeLiteral();
+					setState(185);
+					match(T__7);
 				}
-				break;
-			case Ident:
-				_localctx = new ClsTypeContext(_localctx);
-				enterOuterAlt(_localctx, 7);
-				{
-				setState(187);
-				classifierTypeRule();
-				}
-				break;
-			case T__51:
-				_localctx = new ClassifierSetTypeContext(_localctx);
-				enterOuterAlt(_localctx, 8);
-				{
-				setState(188);
-				match(T__51);
-				setState(189);
-				classifierTypeRule();
-				setState(194);
-				_errHandler.sync(this);
-				_la = _input.LA(1);
-				while (_la==T__37) {
-					{
-					{
-					setState(190);
-					match(T__37);
-					setState(191);
+					break;
+				case Ident:
+					_localctx = new ClsTypeContext(_localctx);
+					enterOuterAlt(_localctx, 7); {
+					setState(187);
 					classifierTypeRule();
-					}
-					}
-					setState(196);
+				}
+					break;
+				case T__51:
+					_localctx = new ClassifierSetTypeContext(_localctx);
+					enterOuterAlt(_localctx, 8); {
+					setState(188);
+					match(T__51);
+					setState(189);
+					classifierTypeRule();
+					setState(194);
 					_errHandler.sync(this);
 					_la = _input.LA(1);
+					while (_la == T__37) {
+						{
+							{
+								setState(190);
+								match(T__37);
+								setState(191);
+								classifierTypeRule();
+							}
+						}
+						setState(196);
+						_errHandler.sync(this);
+						_la = _input.LA(1);
+					}
+					setState(197);
+					match(T__42);
 				}
-				setState(197);
-				match(T__42);
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
+					break;
+				default:
+					throw new NoViableAltException(this);
 			}
-		}
-		catch (RecognitionException re) {
+		} catch (RecognitionException re) {
 			_localctx.exception = re;
 			_errHandler.reportError(this, re);
 			_errHandler.recover(this, re);
-		}
-		finally {
+		} finally {
 			exitRule();
 		}
 		return _localctx;
@@ -1782,38 +2224,65 @@
 		public ClassifierTypeRuleContext(ParserRuleContext parent, int invokingState) {
 			super(parent, invokingState);
 		}
-		@Override public int getRuleIndex() { return RULE_classifierTypeRule; }
-	 
-		public ClassifierTypeRuleContext() { }
+
+		@Override
+		public int getRuleIndex() {
+			return RULE_classifierTypeRule;
+		}
+
+		public ClassifierTypeRuleContext() {
+		}
+
 		public void copyFrom(ClassifierTypeRuleContext ctx) {
 			super.copyFrom(ctx);
 		}
 	}
+
 	public static class ClassifierTypeContext extends ClassifierTypeRuleContext {
-		public List<TerminalNode> Ident() { return getTokens(QueryParser.Ident); }
+		public List<TerminalNode> Ident() {
+			return getTokens(QueryParser.Ident);
+		}
+
 		public TerminalNode Ident(int i) {
 			return getToken(QueryParser.Ident, i);
 		}
-		public ClassifierTypeContext(ClassifierTypeRuleContext ctx) { copyFrom(ctx); }
+
+		public ClassifierTypeContext(ClassifierTypeRuleContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterClassifierType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterClassifierType(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitClassifierType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitClassifierType(this);
 		}
 	}
+
 	public static class ErrorClassifierTypeContext extends ClassifierTypeRuleContext {
-		public TerminalNode Ident() { return getToken(QueryParser.Ident, 0); }
-		public ErrorClassifierTypeContext(ClassifierTypeRuleContext ctx) { copyFrom(ctx); }
+		public TerminalNode Ident() {
+			return getToken(QueryParser.Ident, 0);
+		}
+
+		public ErrorClassifierTypeContext(ClassifierTypeRuleContext ctx) {
+			copyFrom(ctx);
+		}
+
 		@Override
 		public void enterRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).enterErrorClassifierType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).enterErrorClassifierType(this);
 		}
+
 		@Override
 		public void exitRule(ParseTreeListener listener) {
-			if ( listener instanceof QueryListener ) ((QueryListener)listener).exitErrorClassifierType(this);
+			if (listener instanceof QueryListener)
+				((QueryListener)listener).exitErrorClassifierType(this);
 		}
 	}
 
@@ -1823,37 +2292,33 @@
 		try {
 			setState(206);
 			_errHandler.sync(this);
-			switch ( getInterpreter().adaptivePredict(_input,13,_ctx) ) {
-			case 1:
-				_localctx = new ClassifierTypeContext(_localctx);
-				enterOuterAlt(_localctx, 1);
-				{
-				setState(201);
-				match(Ident);
-				setState(202);
-				match(T__44);
-				setState(203);
-				match(Ident);
+			switch (getInterpreter().adaptivePredict(_input, 13, _ctx)) {
+				case 1:
+					_localctx = new ClassifierTypeContext(_localctx);
+					enterOuterAlt(_localctx, 1); {
+					setState(201);
+					match(Ident);
+					setState(202);
+					match(T__44);
+					setState(203);
+					match(Ident);
 				}
-				break;
-			case 2:
-				_localctx = new ErrorClassifierTypeContext(_localctx);
-				enterOuterAlt(_localctx, 2);
-				{
-				setState(204);
-				match(Ident);
-				setState(205);
-				match(T__15);
+					break;
+				case 2:
+					_localctx = new ErrorClassifierTypeContext(_localctx);
+					enterOuterAlt(_localctx, 2); {
+					setState(204);
+					match(Ident);
+					setState(205);
+					match(T__15);
 				}
-				break;
+					break;
 			}
-		}
-		catch (RecognitionException re) {
+		} catch (RecognitionException re) {
 			_localctx.exception = re;
 			_errHandler.reportError(this, re);
 			_errHandler.recover(this, re);
-		}
-		finally {
+		} finally {
 			exitRule();
 		}
 		return _localctx;
@@ -1861,108 +2326,108 @@
 
 	public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
 		switch (ruleIndex) {
-		case 1:
-			return expression_sempred((ExpressionContext)_localctx, predIndex);
-		}
-		return true;
-	}
-	private boolean expression_sempred(ExpressionContext _localctx, int predIndex) {
-		switch (predIndex) {
-		case 0:
-			return precpred(_ctx, 12);
-		case 1:
-			return precpred(_ctx, 11);
-		case 2:
-			return precpred(_ctx, 10);
-		case 3:
-			return precpred(_ctx, 9);
-		case 4:
-			return precpred(_ctx, 8);
-		case 5:
-			return precpred(_ctx, 7);
-		case 6:
-			return precpred(_ctx, 6);
-		case 7:
-			return precpred(_ctx, 15);
+			case 1:
+				return expression_sempred((ExpressionContext)_localctx, predIndex);
 		}
 		return true;
 	}
 
-	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3=\u00d3\4\2\t\2\4"+
-		"\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+
-		"\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3"+
-		"\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3"+
-		"\3\3\7\39\n\3\f\3\16\3<\13\3\3\3\3\3\3\3\5\3A\n\3\3\3\3\3\3\3\3\3\3\3"+
-		"\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3"+
-		"\3\3\3\3\3\7\3\\\n\3\f\3\16\3_\13\3\3\4\3\4\3\4\5\4d\n\4\3\4\3\4\3\4\3"+
-		"\5\3\5\3\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\5\7s\n\7\3\b\3\b\3\b\3\b\3\b\3"+
-		"\b\3\b\3\b\3\b\3\b\3\b\5\b\u0080\n\b\3\t\3\t\3\n\3\n\3\13\3\13\3\13\7"+
-		"\13\u0089\n\13\f\13\16\13\u008c\13\13\5\13\u008e\n\13\3\f\3\f\3\f\5\f"+
-		"\u0093\n\f\3\f\3\f\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r"+
-		"\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\5\r\u00b0\n\r\3\16\3"+
-		"\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3"+
-		"\16\3\16\7\16\u00c3\n\16\f\16\16\16\u00c6\13\16\3\16\3\16\5\16\u00ca\n"+
-		"\16\3\17\3\17\3\17\3\17\3\17\5\17\u00d1\n\17\3\17\2\3\4\20\2\4\6\b\n\f"+
-		"\16\20\22\24\26\30\32\34\2\5\4\2\4\4\24\24\4\2\23\23\25\33\3\2\36\'\2"+
-		"\u00ee\2\36\3\2\2\2\4@\3\2\2\2\6`\3\2\2\2\bh\3\2\2\2\nj\3\2\2\2\fr\3\2"+
-		"\2\2\16\177\3\2\2\2\20\u0081\3\2\2\2\22\u0083\3\2\2\2\24\u008d\3\2\2\2"+
-		"\26\u008f\3\2\2\2\30\u00af\3\2\2\2\32\u00c9\3\2\2\2\34\u00d0\3\2\2\2\36"+
-		"\37\5\4\3\2\37 \7\2\2\3 \3\3\2\2\2!\"\b\3\1\2\"#\7\3\2\2#A\5\4\3\20$%"+
-		"\7\4\2\2%A\5\4\3\17&A\7=\2\2\'A\5\30\r\2()\7\t\2\2)*\5\4\3\2*+\7\n\2\2"+
-		"+A\3\2\2\2,-\7\13\2\2-.\5\4\3\2./\7\f\2\2/\60\5\4\3\2\60\61\7\r\2\2\61"+
-		"\62\5\4\3\2\62\63\7\16\2\2\63A\3\2\2\2\64\65\7\17\2\2\65:\5\6\4\2\66\67"+
-		"\7\20\2\2\679\5\6\4\28\66\3\2\2\29<\3\2\2\2:8\3\2\2\2:;\3\2\2\2;=\3\2"+
-		"\2\2<:\3\2\2\2=>\7\21\2\2>?\5\4\3\3?A\3\2\2\2@!\3\2\2\2@$\3\2\2\2@&\3"+
-		"\2\2\2@\'\3\2\2\2@(\3\2\2\2@,\3\2\2\2@\64\3\2\2\2A]\3\2\2\2BC\f\16\2\2"+
-		"CD\78\2\2D\\\5\4\3\17EF\f\r\2\2FG\5\b\5\2GH\5\4\3\16H\\\3\2\2\2IJ\f\f"+
-		"\2\2JK\5\n\6\2KL\5\4\3\rL\\\3\2\2\2MN\f\13\2\2NO\7\5\2\2O\\\5\4\3\fPQ"+
-		"\f\n\2\2QR\7\6\2\2R\\\5\4\3\13ST\f\t\2\2TU\7\7\2\2U\\\5\4\3\nVW\f\b\2"+
-		"\2WX\7\b\2\2X\\\5\4\3\tYZ\f\21\2\2Z\\\5\f\7\2[B\3\2\2\2[E\3\2\2\2[I\3"+
-		"\2\2\2[M\3\2\2\2[P\3\2\2\2[S\3\2\2\2[V\3\2\2\2[Y\3\2\2\2\\_\3\2\2\2]["+
-		"\3\2\2\2]^\3\2\2\2^\5\3\2\2\2_]\3\2\2\2`c\7=\2\2ab\7\22\2\2bd\5\32\16"+
-		"\2ca\3\2\2\2cd\3\2\2\2de\3\2\2\2ef\7\23\2\2fg\5\4\3\2g\7\3\2\2\2hi\t\2"+
-		"\2\2i\t\3\2\2\2jk\t\3\2\2k\13\3\2\2\2lm\7\34\2\2ms\7=\2\2no\7\34\2\2o"+
-		"s\5\16\b\2pq\7\35\2\2qs\5\16\b\2rl\3\2\2\2rn\3\2\2\2rp\3\2\2\2s\r\3\2"+
-		"\2\2tu\5\22\n\2uv\7\t\2\2vw\5\26\f\2wx\5\20\t\2xy\7\n\2\2y\u0080\3\2\2"+
-		"\2z{\7=\2\2{|\7\t\2\2|}\5\24\13\2}~\7\n\2\2~\u0080\3\2\2\2\177t\3\2\2"+
-		"\2\177z\3\2\2\2\u0080\17\3\2\2\2\u0081\u0082\5\4\3\2\u0082\21\3\2\2\2"+
-		"\u0083\u0084\t\4\2\2\u0084\23\3\2\2\2\u0085\u008a\5\4\3\2\u0086\u0087"+
-		"\7\20\2\2\u0087\u0089\5\4\3\2\u0088\u0086\3\2\2\2\u0089\u008c\3\2\2\2"+
-		"\u008a\u0088\3\2\2\2\u008a\u008b\3\2\2\2\u008b\u008e\3\2\2\2\u008c\u008a"+
-		"\3\2\2\2\u008d\u0085\3\2\2\2\u008d\u008e\3\2\2\2\u008e\25\3\2\2\2\u008f"+
-		"\u0092\7=\2\2\u0090\u0091\7\22\2\2\u0091\u0093\5\32\16\2\u0092\u0090\3"+
-		"\2\2\2\u0092\u0093\3\2\2\2\u0093\u0094\3\2\2\2\u0094\u0095\7(\2\2\u0095"+
-		"\27\3\2\2\2\u0096\u00b0\7;\2\2\u0097\u00b0\7<\2\2\u0098\u00b0\79\2\2\u0099"+
-		"\u00b0\7:\2\2\u009a\u00b0\7)\2\2\u009b\u00b0\7*\2\2\u009c\u00b0\7+\2\2"+
-		"\u009d\u009e\7,\2\2\u009e\u009f\5\24\13\2\u009f\u00a0\7-\2\2\u00a0\u00b0"+
-		"\3\2\2\2\u00a1\u00a2\7.\2\2\u00a2\u00a3\5\24\13\2\u00a3\u00a4\7-\2\2\u00a4"+
-		"\u00b0\3\2\2\2\u00a5\u00a6\7=\2\2\u00a6\u00a7\7/\2\2\u00a7\u00a8\7=\2"+
-		"\2\u00a8\u00a9\7/\2\2\u00a9\u00b0\7=\2\2\u00aa\u00ab\7=\2\2\u00ab\u00ac"+
-		"\7/\2\2\u00ac\u00ad\7=\2\2\u00ad\u00b0\7\22\2\2\u00ae\u00b0\5\32\16\2"+
-		"\u00af\u0096\3\2\2\2\u00af\u0097\3\2\2\2\u00af\u0098\3\2\2\2\u00af\u0099"+
-		"\3\2\2\2\u00af\u009a\3\2\2\2\u00af\u009b\3\2\2\2\u00af\u009c\3\2\2\2\u00af"+
-		"\u009d\3\2\2\2\u00af\u00a1\3\2\2\2\u00af\u00a5\3\2\2\2\u00af\u00aa\3\2"+
-		"\2\2\u00af\u00ae\3\2\2\2\u00b0\31\3\2\2\2\u00b1\u00ca\7\60\2\2\u00b2\u00ca"+
-		"\7\61\2\2\u00b3\u00ca\7\62\2\2\u00b4\u00ca\7\63\2\2\u00b5\u00b6\7\64\2"+
-		"\2\u00b6\u00b7\5\32\16\2\u00b7\u00b8\7\n\2\2\u00b8\u00ca\3\2\2\2\u00b9"+
-		"\u00ba\7\65\2\2\u00ba\u00bb\5\32\16\2\u00bb\u00bc\7\n\2\2\u00bc\u00ca"+
-		"\3\2\2\2\u00bd\u00ca\5\34\17\2\u00be\u00bf\7\66\2\2\u00bf\u00c4\5\34\17"+
-		"\2\u00c0\u00c1\7(\2\2\u00c1\u00c3\5\34\17\2\u00c2\u00c0\3\2\2\2\u00c3"+
-		"\u00c6\3\2\2\2\u00c4\u00c2\3\2\2\2\u00c4\u00c5\3\2\2\2\u00c5\u00c7\3\2"+
-		"\2\2\u00c6\u00c4\3\2\2\2\u00c7\u00c8\7-\2\2\u00c8\u00ca\3\2\2\2\u00c9"+
-		"\u00b1\3\2\2\2\u00c9\u00b2\3\2\2\2\u00c9\u00b3\3\2\2\2\u00c9\u00b4\3\2"+
-		"\2\2\u00c9\u00b5\3\2\2\2\u00c9\u00b9\3\2\2\2\u00c9\u00bd\3\2\2\2\u00c9"+
-		"\u00be\3\2\2\2\u00ca\33\3\2\2\2\u00cb\u00cc\7=\2\2\u00cc\u00cd\7/\2\2"+
-		"\u00cd\u00d1\7=\2\2\u00ce\u00cf\7=\2\2\u00cf\u00d1\7\22\2\2\u00d0\u00cb"+
-		"\3\2\2\2\u00d0\u00ce\3\2\2\2\u00d1\35\3\2\2\2\20:@[]cr\177\u008a\u008d"+
-		"\u0092\u00af\u00c4\u00c9\u00d0";
-	public static final ATN _ATN =
-		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
+	private boolean expression_sempred(ExpressionContext _localctx, int predIndex) {
+		switch (predIndex) {
+			case 0:
+				return precpred(_ctx, 12);
+			case 1:
+				return precpred(_ctx, 11);
+			case 2:
+				return precpred(_ctx, 10);
+			case 3:
+				return precpred(_ctx, 9);
+			case 4:
+				return precpred(_ctx, 8);
+			case 5:
+				return precpred(_ctx, 7);
+			case 6:
+				return precpred(_ctx, 6);
+			case 7:
+				return precpred(_ctx, 15);
+		}
+		return true;
+	}
+
+	public static final String _serializedATN = "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3=\u00d3\4\2\t\2\4"
+			+ "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"
+			+ "\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3"
+			+ "\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3"
+			+ "\3\3\7\39\n\3\f\3\16\3<\13\3\3\3\3\3\3\3\5\3A\n\3\3\3\3\3\3\3\3\3\3\3"
+			+ "\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3"
+			+ "\3\3\3\3\3\7\3\\\n\3\f\3\16\3_\13\3\3\4\3\4\3\4\5\4d\n\4\3\4\3\4\3\4\3"
+			+ "\5\3\5\3\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\5\7s\n\7\3\b\3\b\3\b\3\b\3\b\3"
+			+ "\b\3\b\3\b\3\b\3\b\3\b\5\b\u0080\n\b\3\t\3\t\3\n\3\n\3\13\3\13\3\13\7"
+			+ "\13\u0089\n\13\f\13\16\13\u008c\13\13\5\13\u008e\n\13\3\f\3\f\3\f\5\f"
+			+ "\u0093\n\f\3\f\3\f\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r"
+			+ "\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\5\r\u00b0\n\r\3\16\3"
+			+ "\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3"
+			+ "\16\3\16\7\16\u00c3\n\16\f\16\16\16\u00c6\13\16\3\16\3\16\5\16\u00ca\n"
+			+ "\16\3\17\3\17\3\17\3\17\3\17\5\17\u00d1\n\17\3\17\2\3\4\20\2\4\6\b\n\f"
+			+ "\16\20\22\24\26\30\32\34\2\5\4\2\4\4\24\24\4\2\23\23\25\33\3\2\36\'\2"
+			+ "\u00ee\2\36\3\2\2\2\4@\3\2\2\2\6`\3\2\2\2\bh\3\2\2\2\nj\3\2\2\2\fr\3\2"
+			+ "\2\2\16\177\3\2\2\2\20\u0081\3\2\2\2\22\u0083\3\2\2\2\24\u008d\3\2\2\2"
+			+ "\26\u008f\3\2\2\2\30\u00af\3\2\2\2\32\u00c9\3\2\2\2\34\u00d0\3\2\2\2\36"
+			+ "\37\5\4\3\2\37 \7\2\2\3 \3\3\2\2\2!\"\b\3\1\2\"#\7\3\2\2#A\5\4\3\20$%"
+			+ "\7\4\2\2%A\5\4\3\17&A\7=\2\2\'A\5\30\r\2()\7\t\2\2)*\5\4\3\2*+\7\n\2\2"
+			+ "+A\3\2\2\2,-\7\13\2\2-.\5\4\3\2./\7\f\2\2/\60\5\4\3\2\60\61\7\r\2\2\61"
+			+ "\62\5\4\3\2\62\63\7\16\2\2\63A\3\2\2\2\64\65\7\17\2\2\65:\5\6\4\2\66\67"
+			+ "\7\20\2\2\679\5\6\4\28\66\3\2\2\29<\3\2\2\2:8\3\2\2\2:;\3\2\2\2;=\3\2"
+			+ "\2\2<:\3\2\2\2=>\7\21\2\2>?\5\4\3\3?A\3\2\2\2@!\3\2\2\2@$\3\2\2\2@&\3"
+			+ "\2\2\2@\'\3\2\2\2@(\3\2\2\2@,\3\2\2\2@\64\3\2\2\2A]\3\2\2\2BC\f\16\2\2"
+			+ "CD\78\2\2D\\\5\4\3\17EF\f\r\2\2FG\5\b\5\2GH\5\4\3\16H\\\3\2\2\2IJ\f\f"
+			+ "\2\2JK\5\n\6\2KL\5\4\3\rL\\\3\2\2\2MN\f\13\2\2NO\7\5\2\2O\\\5\4\3\fPQ"
+			+ "\f\n\2\2QR\7\6\2\2R\\\5\4\3\13ST\f\t\2\2TU\7\7\2\2U\\\5\4\3\nVW\f\b\2"
+			+ "\2WX\7\b\2\2X\\\5\4\3\tYZ\f\21\2\2Z\\\5\f\7\2[B\3\2\2\2[E\3\2\2\2[I\3"
+			+ "\2\2\2[M\3\2\2\2[P\3\2\2\2[S\3\2\2\2[V\3\2\2\2[Y\3\2\2\2\\_\3\2\2\2]["
+			+ "\3\2\2\2]^\3\2\2\2^\5\3\2\2\2_]\3\2\2\2`c\7=\2\2ab\7\22\2\2bd\5\32\16"
+			+ "\2ca\3\2\2\2cd\3\2\2\2de\3\2\2\2ef\7\23\2\2fg\5\4\3\2g\7\3\2\2\2hi\t\2"
+			+ "\2\2i\t\3\2\2\2jk\t\3\2\2k\13\3\2\2\2lm\7\34\2\2ms\7=\2\2no\7\34\2\2o"
+			+ "s\5\16\b\2pq\7\35\2\2qs\5\16\b\2rl\3\2\2\2rn\3\2\2\2rp\3\2\2\2s\r\3\2"
+			+ "\2\2tu\5\22\n\2uv\7\t\2\2vw\5\26\f\2wx\5\20\t\2xy\7\n\2\2y\u0080\3\2\2"
+			+ "\2z{\7=\2\2{|\7\t\2\2|}\5\24\13\2}~\7\n\2\2~\u0080\3\2\2\2\177t\3\2\2"
+			+ "\2\177z\3\2\2\2\u0080\17\3\2\2\2\u0081\u0082\5\4\3\2\u0082\21\3\2\2\2"
+			+ "\u0083\u0084\t\4\2\2\u0084\23\3\2\2\2\u0085\u008a\5\4\3\2\u0086\u0087"
+			+ "\7\20\2\2\u0087\u0089\5\4\3\2\u0088\u0086\3\2\2\2\u0089\u008c\3\2\2\2"
+			+ "\u008a\u0088\3\2\2\2\u008a\u008b\3\2\2\2\u008b\u008e\3\2\2\2\u008c\u008a"
+			+ "\3\2\2\2\u008d\u0085\3\2\2\2\u008d\u008e\3\2\2\2\u008e\25\3\2\2\2\u008f"
+			+ "\u0092\7=\2\2\u0090\u0091\7\22\2\2\u0091\u0093\5\32\16\2\u0092\u0090\3"
+			+ "\2\2\2\u0092\u0093\3\2\2\2\u0093\u0094\3\2\2\2\u0094\u0095\7(\2\2\u0095"
+			+ "\27\3\2\2\2\u0096\u00b0\7;\2\2\u0097\u00b0\7<\2\2\u0098\u00b0\79\2\2\u0099"
+			+ "\u00b0\7:\2\2\u009a\u00b0\7)\2\2\u009b\u00b0\7*\2\2\u009c\u00b0\7+\2\2"
+			+ "\u009d\u009e\7,\2\2\u009e\u009f\5\24\13\2\u009f\u00a0\7-\2\2\u00a0\u00b0"
+			+ "\3\2\2\2\u00a1\u00a2\7.\2\2\u00a2\u00a3\5\24\13\2\u00a3\u00a4\7-\2\2\u00a4"
+			+ "\u00b0\3\2\2\2\u00a5\u00a6\7=\2\2\u00a6\u00a7\7/\2\2\u00a7\u00a8\7=\2"
+			+ "\2\u00a8\u00a9\7/\2\2\u00a9\u00b0\7=\2\2\u00aa\u00ab\7=\2\2\u00ab\u00ac"
+			+ "\7/\2\2\u00ac\u00ad\7=\2\2\u00ad\u00b0\7\22\2\2\u00ae\u00b0\5\32\16\2"
+			+ "\u00af\u0096\3\2\2\2\u00af\u0097\3\2\2\2\u00af\u0098\3\2\2\2\u00af\u0099"
+			+ "\3\2\2\2\u00af\u009a\3\2\2\2\u00af\u009b\3\2\2\2\u00af\u009c\3\2\2\2\u00af"
+			+ "\u009d\3\2\2\2\u00af\u00a1\3\2\2\2\u00af\u00a5\3\2\2\2\u00af\u00aa\3\2"
+			+ "\2\2\u00af\u00ae\3\2\2\2\u00b0\31\3\2\2\2\u00b1\u00ca\7\60\2\2\u00b2\u00ca"
+			+ "\7\61\2\2\u00b3\u00ca\7\62\2\2\u00b4\u00ca\7\63\2\2\u00b5\u00b6\7\64\2"
+			+ "\2\u00b6\u00b7\5\32\16\2\u00b7\u00b8\7\n\2\2\u00b8\u00ca\3\2\2\2\u00b9"
+			+ "\u00ba\7\65\2\2\u00ba\u00bb\5\32\16\2\u00bb\u00bc\7\n\2\2\u00bc\u00ca"
+			+ "\3\2\2\2\u00bd\u00ca\5\34\17\2\u00be\u00bf\7\66\2\2\u00bf\u00c4\5\34\17"
+			+ "\2\u00c0\u00c1\7(\2\2\u00c1\u00c3\5\34\17\2\u00c2\u00c0\3\2\2\2\u00c3"
+			+ "\u00c6\3\2\2\2\u00c4\u00c2\3\2\2\2\u00c4\u00c5\3\2\2\2\u00c5\u00c7\3\2"
+			+ "\2\2\u00c6\u00c4\3\2\2\2\u00c7\u00c8\7-\2\2\u00c8\u00ca\3\2\2\2\u00c9"
+			+ "\u00b1\3\2\2\2\u00c9\u00b2\3\2\2\2\u00c9\u00b3\3\2\2\2\u00c9\u00b4\3\2"
+			+ "\2\2\u00c9\u00b5\3\2\2\2\u00c9\u00b9\3\2\2\2\u00c9\u00bd\3\2\2\2\u00c9"
+			+ "\u00be\3\2\2\2\u00ca\33\3\2\2\2\u00cb\u00cc\7=\2\2\u00cc\u00cd\7/\2\2"
+			+ "\u00cd\u00d1\7=\2\2\u00ce\u00cf\7=\2\2\u00cf\u00d1\7\22\2\2\u00d0\u00cb"
+			+ "\3\2\2\2\u00d0\u00ce\3\2\2\2\u00d1\35\3\2\2\2\20:@[]cr\177\u008a\u008d"
+			+ "\u0092\u00af\u00c4\u00c9\u00d0";
+
+	public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
 		_decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
 		for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
 			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstBuilder.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstBuilder.java
index 092f7f2..e97eeee 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstBuilder.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstBuilder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -11,7 +11,6 @@
 package org.eclipse.acceleo.query.parser;
 
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
@@ -20,8 +19,10 @@
 import org.eclipse.acceleo.query.ast.Binding;
 import org.eclipse.acceleo.query.ast.BooleanLiteral;
 import org.eclipse.acceleo.query.ast.Call;
+import org.eclipse.acceleo.query.ast.ClassTypeLiteral;
 import org.eclipse.acceleo.query.ast.CollectionTypeLiteral;
 import org.eclipse.acceleo.query.ast.Conditional;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
 import org.eclipse.acceleo.query.ast.EnumLiteral;
 import org.eclipse.acceleo.query.ast.ErrorBinding;
 import org.eclipse.acceleo.query.ast.ErrorCall;
@@ -37,7 +38,6 @@
 import org.eclipse.acceleo.query.ast.IntegerLiteral;
 import org.eclipse.acceleo.query.ast.Lambda;
 import org.eclipse.acceleo.query.ast.Let;
-import org.eclipse.acceleo.query.ast.Literal;
 import org.eclipse.acceleo.query.ast.NullLiteral;
 import org.eclipse.acceleo.query.ast.Or;
 import org.eclipse.acceleo.query.ast.RealLiteral;
@@ -49,7 +49,9 @@
 import org.eclipse.acceleo.query.ast.VarRef;
 import org.eclipse.acceleo.query.ast.VariableDeclaration;
 import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 
 /**
@@ -75,16 +77,24 @@
 	private static final String INVALID_ESCAPE_SEQUENCE = "Invalid escape sequence : ";
 
 	/**
-	 * Creates a new {@link EnumLiteral} instance given an {@link EEnumLiteral}.
+	 * Creates a new {@link EnumLiteral} instance.
 	 * 
-	 * @param eLiteral
-	 *            the {@link EEnumLiteral} this literal denotes.
-	 * @return an new {@link EnumLiteral} denoting the specified {@link EEnumLiteral}.
+	 * @param ePackageName
+	 *            the {@link EPackage#getName() ePackage name}
+	 * @param eEnumName
+	 *            the {@link EEnum#getName() eEnum name}
+	 * @param eEnumLiteralName
+	 *            the {@link EEnumLiteral#getName() eEnumLiteral name}
+	 * @return the created {@link EnumLiteral}.
 	 */
-	public EnumLiteral enumLiteral(EEnumLiteral eLiteral) {
-		EnumLiteral literal = (EnumLiteral)EcoreUtil.create(AstPackage.Literals.ENUM_LITERAL);
-		literal.setLiteral(eLiteral);
-		return literal;
+	public EnumLiteral enumLiteral(String ePackageName, String eEnumName, String eEnumLiteralName) {
+		final EnumLiteral result = (EnumLiteral)EcoreUtil.create(AstPackage.Literals.ENUM_LITERAL);
+
+		result.setEPackageName(ePackageName);
+		result.setEEnumName(eEnumName);
+		result.setEEnumLiteralName(eEnumLiteralName);
+
+		return result;
 	}
 
 	/**
@@ -134,8 +144,8 @@
 	 * @return the new {@link ErrorStringLiteral}
 	 */
 	public ErrorStringLiteral errorStringLiteral(String str) {
-		ErrorStringLiteral errorStringLiteral = (ErrorStringLiteral)EcoreUtil
-				.create(AstPackage.Literals.ERROR_STRING_LITERAL);
+		ErrorStringLiteral errorStringLiteral = (ErrorStringLiteral)EcoreUtil.create(
+				AstPackage.Literals.ERROR_STRING_LITERAL);
 		errorStringLiteral.setValue(str);
 		return errorStringLiteral;
 	}
@@ -235,14 +245,14 @@
 	 */
 	private static char[] stripUChar(String text, final int end, int i) {
 		if (i + 4 < end) {
-			return charFromHexaCode(text.charAt(i + 1), text.charAt(i + 2), text.charAt(i + 3), text
-					.charAt(i + 4));
+			return charFromHexaCode(text.charAt(i + 1), text.charAt(i + 2), text.charAt(i + 3), text.charAt(i
+					+ 4));
 		} else if (i + 3 < end) {
-			throw new IllegalArgumentException(INVALID_ESCAPE_SEQUENCE + ESCAPE_U + text.charAt(i + 1)
-					+ text.charAt(i + 2) + text.charAt(i + 3));
+			throw new IllegalArgumentException(INVALID_ESCAPE_SEQUENCE + ESCAPE_U + text.charAt(i + 1) + text
+					.charAt(i + 2) + text.charAt(i + 3));
 		} else if (i + 2 < end) {
-			throw new IllegalArgumentException(INVALID_ESCAPE_SEQUENCE + ESCAPE_U + text.charAt(i + 1)
-					+ text.charAt(i + 2));
+			throw new IllegalArgumentException(INVALID_ESCAPE_SEQUENCE + ESCAPE_U + text.charAt(i + 1) + text
+					.charAt(i + 2));
 		} else if (i + 1 < end) {
 			throw new IllegalArgumentException(INVALID_ESCAPE_SEQUENCE + ESCAPE_U + text.charAt(i + 1));
 		} else {
@@ -320,51 +330,50 @@
 	 *            the type of the element
 	 * @return a new collection type literal
 	 */
-	public CollectionTypeLiteral collectionTypeLiteral(Object type, TypeLiteral elementType) {
+	public CollectionTypeLiteral collectionTypeLiteral(Class<?> type, TypeLiteral elementType) {
 		if (type != List.class && type != Set.class) {
 			throw new IllegalArgumentException("collection type must be either list or set.");
 		}
-		CollectionTypeLiteral literal = (CollectionTypeLiteral)EcoreUtil
-				.create(AstPackage.Literals.COLLECTION_TYPE_LITERAL);
+		final CollectionTypeLiteral literal = (CollectionTypeLiteral)EcoreUtil.create(
+				AstPackage.Literals.COLLECTION_TYPE_LITERAL);
+
 		literal.setValue(type);
 		literal.setElementType(elementType);
+
 		return literal;
 	}
 
 	/**
-	 * Creates a new {@link TypeLiteral} given the {@link Class} or the {@link org.eclipse.emf.ecore.EClass
-	 * EClass}.
+	 * Creates a new {@link EClassifierTypeLiteral}.
+	 * 
+	 * @param ePackageName
+	 *            the {@link EPackage#getName() ePackage name}
+	 * @param eClassifierName
+	 *            the {@link EClassifier#getName() eClassifier name}
+	 * @return the created {@link EClassifierTypeLiteral}
+	 */
+	public EClassifierTypeLiteral eClassifierTypeLiteral(String ePackageName, String eClassifierName) {
+		final EClassifierTypeLiteral result = (EClassifierTypeLiteral)EcoreUtil.create(
+				AstPackage.Literals.ECLASSIFIER_TYPE_LITERAL);
+
+		result.setEPackageName(ePackageName);
+		result.setEClassifierName(eClassifierName);
+
+		return result;
+	}
+
+	/**
+	 * Creates a new {@link ClassTypeLiteral} given the {@link Class}.
 	 * 
 	 * @param type
-	 *            the {@link Class} or the {@link org.eclipse.emf.ecore.EClass EClass}
-	 * @return a new {@link TypeLiteral} given the class or the EClass.
+	 *            the {@link Class}
+	 * @return the created {@link ClassTypeLiteral}
 	 */
-	public Literal typeLiteral(Object type) {
-		final Literal result;
+	public ClassTypeLiteral typeLiteral(Class<?> type) {
+		final ClassTypeLiteral result;
 
-		if (!(type instanceof Class<?>) && !(type instanceof EClassifier) && !(type instanceof Collection)) {
-			throw new IllegalArgumentException("type argument must be a Class or an EClass instance : "
-					+ type);
-		}
-
-		if (type instanceof Collection) {
-			TypeSetLiteral setLiteral = (TypeSetLiteral)EcoreUtil
-					.create(AstPackage.Literals.TYPE_SET_LITERAL);
-			for (Object oneType : (Collection<?>)type) {
-				TypeLiteral typeLiteral = (TypeLiteral)EcoreUtil.create(AstPackage.Literals.TYPE_LITERAL);
-				typeLiteral.setValue(oneType);
-				setLiteral.getTypes().add(typeLiteral);
-			}
-			if (setLiteral.getTypes().size() == 1) {
-				result = setLiteral.getTypes().get(0);
-			} else {
-				result = setLiteral;
-			}
-		} else {
-			TypeLiteral typeLiteral = (TypeLiteral)EcoreUtil.create(AstPackage.Literals.TYPE_LITERAL);
-			typeLiteral.setValue(type);
-			result = typeLiteral;
-		}
+		result = (ClassTypeLiteral)EcoreUtil.create(AstPackage.Literals.CLASS_TYPE_LITERAL);
+		result.setValue(type);
 
 		return result;
 	}
@@ -478,22 +487,11 @@
 	/**
 	 * Creates a new {@link ErrorTypeLiteral}.
 	 * 
-	 * @param missingColon
-	 *            <code>true</code> if one colon ending is missing, <code>false</code> otherwise
-	 * @param segments
-	 *            known segments of the {@link TypeLiteral}
-	 * @return a new {@link ErrorTypeLiteral}.
+	 * @return the created {@link ErrorTypeLiteral}.
 	 */
-	public ErrorTypeLiteral errorTypeLiteral(boolean missingColon, String... segments) {
-		final ErrorTypeLiteral result = (ErrorTypeLiteral)EcoreUtil
-				.create(AstPackage.Literals.ERROR_TYPE_LITERAL);
-
-		result.setMissingColon(missingColon);
-		for (String segment : segments) {
-			if (segment != null && segment.length() != 0) {
-				result.getSegments().add(segment);
-			}
-		}
+	public ErrorTypeLiteral errorTypeLiteral() {
+		final ErrorTypeLiteral result = (ErrorTypeLiteral)EcoreUtil.create(
+				AstPackage.Literals.ERROR_TYPE_LITERAL);
 
 		return result;
 	}
@@ -503,20 +501,17 @@
 	 * 
 	 * @param missingColon
 	 *            <code>true</code> if one colon ending is missing, <code>false</code> otherwise
-	 * @param segments
-	 *            known segments of the {@link TypeLiteral}
-	 * @return a new {@link ErrorEClassifierTypeLiteral}.
+	 * @param ePackageName
+	 *            the {@link EPackage#getName() ePackage name}
+	 * @return the created {@link ErrorEClassifierTypeLiteral}
 	 */
-	public ErrorEClassifierTypeLiteral errorEClassifierTypeLiteral(boolean missingColon, String... segments) {
-		final ErrorEClassifierTypeLiteral result = (ErrorEClassifierTypeLiteral)EcoreUtil
-				.create(AstPackage.Literals.ERROR_ECLASSIFIER_TYPE_LITERAL);
+	public ErrorEClassifierTypeLiteral errorEClassifierTypeLiteral(boolean missingColon,
+			String ePackageName) {
+		final ErrorEClassifierTypeLiteral result = (ErrorEClassifierTypeLiteral)EcoreUtil.create(
+				AstPackage.Literals.ERROR_ECLASSIFIER_TYPE_LITERAL);
 
 		result.setMissingColon(missingColon);
-		for (String segment : segments) {
-			if (segment != null && segment.length() != 0) {
-				result.getSegments().add(segment);
-			}
-		}
+		result.setEPackageName(ePackageName);
 
 		return result;
 	}
@@ -526,20 +521,19 @@
 	 * 
 	 * @param missingColon
 	 *            <code>true</code> if one colon ending is missing, <code>false</code> otherwise
-	 * @param segments
-	 *            known segments of the {@link ErrorEnumLiteral}
+	 * @param ePackageName
+	 *            the {@link EPackage#getName() ePackage name}
+	 * @param eEnumName
+	 *            the {@link EEnum#getName() eEnum name}
 	 * @return a new {@link ErrorEnumLiteral}.
 	 */
-	public ErrorEnumLiteral errorEnumLiteral(boolean missingColon, String... segments) {
-		final ErrorEnumLiteral result = (ErrorEnumLiteral)EcoreUtil
-				.create(AstPackage.Literals.ERROR_ENUM_LITERAL);
+	public ErrorEnumLiteral errorEnumLiteral(boolean missingColon, String ePackageName, String eEnumName) {
+		final ErrorEnumLiteral result = (ErrorEnumLiteral)EcoreUtil.create(
+				AstPackage.Literals.ERROR_ENUM_LITERAL);
 
 		result.setMissingColon(missingColon);
-		for (String segment : segments) {
-			if (segment != null && segment.length() != 0) {
-				result.getSegments().add(segment);
-			}
-		}
+		result.setEPackageName(ePackageName);
+		result.setEEnumName(eEnumName);
 
 		return result;
 	}
@@ -575,8 +569,8 @@
 	 * @return a new {@link VariableDeclaration}
 	 */
 	public VariableDeclaration variableDeclaration(String name, Expression expression) {
-		final VariableDeclaration result = (VariableDeclaration)EcoreUtil
-				.create(AstPackage.Literals.VARIABLE_DECLARATION);
+		final VariableDeclaration result = (VariableDeclaration)EcoreUtil.create(
+				AstPackage.Literals.VARIABLE_DECLARATION);
 
 		result.setName(name);
 		result.setExpression(expression);
@@ -620,8 +614,8 @@
 	 * @return a new {@link SetInExtensionLiteral} with the given {@link List} of {@link Expression}
 	 */
 	public SetInExtensionLiteral setInExtension(List<Expression> expressions) {
-		final SetInExtensionLiteral result = (SetInExtensionLiteral)EcoreUtil
-				.create(AstPackage.Literals.SET_IN_EXTENSION_LITERAL);
+		final SetInExtensionLiteral result = (SetInExtensionLiteral)EcoreUtil.create(
+				AstPackage.Literals.SET_IN_EXTENSION_LITERAL);
 
 		result.getValues().addAll(expressions);
 
@@ -636,8 +630,8 @@
 	 * @return a new {@link SequenceInExtensionLiteral} with the given {@link List} of {@link Expression}
 	 */
 	public SequenceInExtensionLiteral sequenceInExtension(List<Expression> expressions) {
-		final SequenceInExtensionLiteral result = (SequenceInExtensionLiteral)EcoreUtil
-				.create(AstPackage.Literals.SEQUENCE_IN_EXTENSION_LITERAL);
+		final SequenceInExtensionLiteral result = (SequenceInExtensionLiteral)EcoreUtil.create(
+				AstPackage.Literals.SEQUENCE_IN_EXTENSION_LITERAL);
 
 		result.getValues().addAll(expressions);
 
@@ -657,8 +651,8 @@
 	 */
 	public ErrorVariableDeclaration errorVariableDeclaration(String variableName, TypeLiteral type,
 			Expression expression) {
-		ErrorVariableDeclaration result = (ErrorVariableDeclaration)EcoreUtil
-				.create(AstPackage.Literals.ERROR_VARIABLE_DECLARATION);
+		ErrorVariableDeclaration result = (ErrorVariableDeclaration)EcoreUtil.create(
+				AstPackage.Literals.ERROR_VARIABLE_DECLARATION);
 
 		result.setName(variableName);
 		result.setType(type);
@@ -755,8 +749,8 @@
 	 * @return the created {@link TypeSetLiteral}
 	 */
 	public TypeSetLiteral typeSetLiteral(List<TypeLiteral> types) {
-		final TypeSetLiteral typeSetLiteral = (TypeSetLiteral)EcoreUtil
-				.create(AstPackage.Literals.TYPE_SET_LITERAL);
+		final TypeSetLiteral typeSetLiteral = (TypeSetLiteral)EcoreUtil.create(
+				AstPackage.Literals.TYPE_SET_LITERAL);
 
 		typeSetLiteral.getTypes().addAll(types);
 
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstBuilderListener.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstBuilderListener.java
index c9286f8..2bfdeca 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstBuilderListener.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstBuilderListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -12,8 +12,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.EmptyStackException;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -112,8 +110,6 @@
 import org.eclipse.acceleo.query.runtime.IReadOnlyQueryEnvironment;
 import org.eclipse.emf.common.util.BasicDiagnostic;
 import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EEnumLiteral;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -329,6 +325,11 @@
 	public static final Set<String> OPERATOR_SERVICE_NAMES = initOperatorServiceNames();
 
 	/**
+	 * Invalid type literal.
+	 */
+	public static final String INVALID_TYPE_LITERAL = "invalid type literal %s";
+
+	/**
 	 * This should not happen.
 	 */
 	private static final String THIS_SHOULDN_T_HAPPEN = "This shouldn't happen.";
@@ -339,21 +340,6 @@
 	private static final String INVALID_ENUM_LITERAL = "invalid enum literal: %s";
 
 	/**
-	 * Invalid type literal.
-	 */
-	private static final String INVALID_TYPE_LITERAL = "invalid type literal %s";
-
-	/**
-	 * Ambiguous {@link EEnumLiteral} message.
-	 */
-	private static final String AMBIGUOUS_ENUM_LITERAL = "several enumliterals are matching the literal name: %s, eenum : %s and package name : %s";
-
-	/**
-	 * Ambiguous {@link EClassifier} message.
-	 */
-	private static final String AMBIGUOUS_TYPE_LITERAL = "several types are matching the EClassifier name: %s , package name : %s";
-
-	/**
 	 * Number of children in {@link ConditionalContext}.
 	 */
 	private static final int CONDITIONAL_CONTEXT_CHILD_COUNT = 7;
@@ -425,20 +411,20 @@
 			if (e.getCtx().getParent().getParent() instanceof VariableDefinitionContext) {
 				errorRule = QueryParser.RULE_expression;
 				final String variableName = e.getCtx().getParent().getChild(0).getText();
-				final ErrorTypeLiteral errorTypeLiteral;
+				final ErrorEClassifierTypeLiteral errorEClassifierTypeLiteral;
 				if (ctx.getChildCount() > 0) {
-					errorTypeLiteral = builder.errorEClassifierTypeLiteral(false, new String[] {ctx.getChild(
-							0).getText(), });
+					errorEClassifierTypeLiteral = builder.errorEClassifierTypeLiteral(false, ctx.getChild(0)
+							.getText());
 				} else {
-					errorTypeLiteral = builder.errorEClassifierTypeLiteral(false, new String[] {});
+					errorEClassifierTypeLiteral = builder.errorEClassifierTypeLiteral(false, null);
 				}
-				setPositions(errorTypeLiteral, ctx.start, (Token)offendingSymbol);
+				setPositions(errorEClassifierTypeLiteral, ctx.start, (Token)offendingSymbol);
 				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR, PLUGIN_ID, 0, String.format(
-						INVALID_TYPE_LITERAL, ctx.getText()), new Object[] {errorTypeLiteral }));
-				errors.add(errorTypeLiteral);
+						INVALID_TYPE_LITERAL, ctx.getText()), new Object[] {errorEClassifierTypeLiteral }));
+				errors.add(errorEClassifierTypeLiteral);
 				final Expression variableExpression = popExpression();
 				final VariableDeclaration variableDeclaration = builder.variableDeclaration(variableName,
-						errorTypeLiteral, variableExpression);
+						errorEClassifierTypeLiteral, variableExpression);
 				setPositions(variableDeclaration, ctx.start, (Token)offendingSymbol);
 				push(variableDeclaration);
 				final ErrorExpression errorExpression = builder.errorExpression();
@@ -446,15 +432,15 @@
 				setPositions(errorExpression, (Token)offendingSymbol, (Token)offendingSymbol);
 			} else {
 				errorRule = QueryParser.RULE_classifierTypeRule;
-				final ErrorTypeLiteral errorTypeLiteral;
+				final ErrorEClassifierTypeLiteral errorEClassifierTypeLiteral;
 				if (ctx.getChildCount() > 0) {
-					errorTypeLiteral = builder.errorEClassifierTypeLiteral(false, new String[] {ctx.getChild(
-							0).getText(), });
+					errorEClassifierTypeLiteral = builder.errorEClassifierTypeLiteral(false, ctx.getChild(0)
+							.getText());
 				} else {
-					errorTypeLiteral = builder.errorEClassifierTypeLiteral(false, new String[] {});
+					errorEClassifierTypeLiteral = builder.errorEClassifierTypeLiteral(false, null);
 				}
-				setPositions(errorTypeLiteral, ctx.start, (Token)offendingSymbol);
-				pushError(errorTypeLiteral, "missing classifier literal");
+				setPositions(errorEClassifierTypeLiteral, ctx.start, (Token)offendingSymbol);
+				pushError(errorEClassifierTypeLiteral, "missing classifier literal");
 			}
 		}
 
@@ -490,7 +476,7 @@
 			if (e.getCtx().getParent() instanceof VariableDefinitionContext) {
 				errorRule = QueryParser.RULE_expression;
 				final String variableName = e.getCtx().getParent().getChild(0).getText();
-				final ErrorTypeLiteral type = builder.errorTypeLiteral(false, new String[] {});
+				final ErrorTypeLiteral type = builder.errorTypeLiteral();
 				setPositions(type, ((TypeLiteralContext)e.getCtx()).start, (Token)offendingSymbol);
 				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR, PLUGIN_ID, 0, String.format(
 						INVALID_TYPE_LITERAL, msg), new Object[] {type }));
@@ -506,7 +492,7 @@
 				setPositions(errorExpression, ((TypeLiteralContext)e.getCtx()).start, (Token)offendingSymbol);
 			} else if (stack.isEmpty() || !(stack.peek() instanceof TypeLiteral)) {
 				errorRule = QueryParser.RULE_typeLiteral;
-				final ErrorTypeLiteral errorTypeLiteral = builder.errorTypeLiteral(false, new String[] {});
+				final ErrorTypeLiteral errorTypeLiteral = builder.errorTypeLiteral();
 				setPositions(errorTypeLiteral, ((TypeLiteralContext)e.getCtx()).start,
 						(Token)offendingSymbol);
 				pushError(errorTypeLiteral, String.format(INVALID_TYPE_LITERAL, msg));
@@ -540,10 +526,10 @@
 				setPositions(errorEnumLiteral, start, end);
 				pushError(errorEnumLiteral, String.format(INVALID_ENUM_LITERAL, msg));
 			} else {
-				final ErrorTypeLiteral errorTypeLiteral = builder.errorTypeLiteral(false, new String[] {
-						ePackage, });
-				setPositions(errorTypeLiteral, start, end);
-				pushError(errorTypeLiteral, String.format(INVALID_TYPE_LITERAL, msg));
+				final ErrorEClassifierTypeLiteral errorEClassifierTypeLiteral = builder
+						.errorEClassifierTypeLiteral(false, ePackage);
+				setPositions(errorEClassifierTypeLiteral, start, end);
+				pushError(errorEClassifierTypeLiteral, String.format(INVALID_TYPE_LITERAL, msg));
 			}
 		}
 
@@ -791,18 +777,20 @@
 	private final AstBuilder builder = new AstBuilder();
 
 	/**
-	 * The {@link IReadOnlyQueryEnvironment}.
-	 */
-	private final IReadOnlyQueryEnvironment environment;
-
-	/**
 	 * Creates a new {@link AstBuilderListener}.
 	 * 
 	 * @param environment
 	 *            the package provider
+	 * @deprecated see {@link #AstBuilderListener()}
 	 */
 	public AstBuilderListener(IReadOnlyQueryEnvironment environment) {
-		this.environment = environment;
+		this();
+	}
+
+	/**
+	 * Creates a new {@link AstBuilderListener}.
+	 */
+	public AstBuilderListener() {
 	}
 
 	/**
@@ -1457,32 +1445,12 @@
 			final String ePackageName = ctx.getChild(0).getText();
 			final String eEnumName = ctx.getChild(2).getText();
 			final String eEnumLiteralName = ctx.getChild(4).getText();
-			final Collection<EEnumLiteral> eEnumLiterals = environment.getEPackageProvider().getEnumLiterals(
-					ePackageName, eEnumName, eEnumLiteralName);
-			if (eEnumLiterals.size() == 0) {
-				List<String> segments = new ArrayList<String>(3);
-				segments.add(ePackageName);
-				segments.add(eEnumName);
-				if (!(ctx.getChild(4) instanceof ErrorNode)) {
-					segments.add(eEnumLiteralName);
-				}
-				toPush = builder.errorEnumLiteral(false, segments.toArray(new String[segments.size()]));
-				if (segments.size() == 3) {
-					pushError((Error)toPush, String.format(INVALID_ENUM_LITERAL,
-							"no literal registered with this name"));
-				} else {
-					pushError((Error)toPush, String.format(INVALID_ENUM_LITERAL, "missing literal name"));
-				}
+			if (ctx.getChild(4) instanceof ErrorNode) {
+				toPush = builder.errorEnumLiteral(false, ePackageName, eEnumName);
+				pushError((Error)toPush, String.format(INVALID_ENUM_LITERAL, "missing literal name"));
 			} else {
-				toPush = builder.enumLiteral(eEnumLiterals.iterator().next());
+				toPush = builder.enumLiteral(ePackageName, eEnumName, eEnumLiteralName);
 				push(toPush);
-				if (eEnumLiterals.size() > 1) {
-					final Integer startPosition = Integer.valueOf(ctx.start.getStartIndex());
-					final Integer stopPosition = Integer.valueOf(ctx.stop.getStopIndex() + 1);
-					diagnosticStack.push(new BasicDiagnostic(Diagnostic.WARNING, PLUGIN_ID, 0, String.format(
-							AMBIGUOUS_ENUM_LITERAL, eEnumLiteralName, eEnumName, ePackageName), new Object[] {
-									startPosition, stopPosition, }));
-				}
 			}
 			setPositions(toPush, ctx.start, ctx.stop);
 		}
@@ -1518,34 +1486,13 @@
 		if (errorRule == NO_ERROR) {
 			final Literal toPush;
 			final String ePackageName = ctx.getChild(0).getText();
-			final String eClassName;
-			Collection<EClassifier> type = Collections.emptySet();
 			if (ctx.getChild(2) == null || ctx.getChild(2) instanceof ErrorNode) {
-				eClassName = null;
-				type = Collections.emptySet();
-			} else {
-				eClassName = ctx.getChild(2).getText();
-				type = environment.getEPackageProvider().getTypes(ePackageName, eClassName);
-			}
-			if (type.size() == 0) {
-				List<String> segments = new ArrayList<String>(2);
-				segments.add(ePackageName);
-				if (eClassName != null) {
-					segments.add(eClassName);
-				}
-				toPush = builder.errorEClassifierTypeLiteral(false, segments.toArray(new String[segments
-						.size()]));
+				toPush = builder.errorEClassifierTypeLiteral(false, ePackageName);
 				pushError((Error)toPush, String.format(INVALID_TYPE_LITERAL, ctx.getText()));
 			} else {
-				toPush = builder.typeLiteral(type);
+				final String eClassName = ctx.getChild(2).getText();
+				toPush = builder.eClassifierTypeLiteral(ePackageName, eClassName);
 				push(toPush);
-				if (type.size() > 1) {
-					final Integer startPosition = Integer.valueOf(ctx.start.getStartIndex());
-					final Integer stopPosition = Integer.valueOf(ctx.stop.getStopIndex() + 1);
-					diagnosticStack.push(new BasicDiagnostic(Diagnostic.WARNING, PLUGIN_ID, 0, String.format(
-							AMBIGUOUS_TYPE_LITERAL, eClassName, ePackageName), new Object[] {startPosition,
-									stopPosition, }));
-				}
 			}
 			setPositions(toPush, ctx.start, ctx.stop);
 		}
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstCompletor.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstCompletor.java
index 7de12f0..02fadf4 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstCompletor.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstCompletor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -43,6 +43,8 @@
 import org.eclipse.acceleo.query.validation.type.IType;
 import org.eclipse.acceleo.query.validation.type.NothingType;
 import org.eclipse.acceleo.query.validation.type.SetType;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EPackage;
 
 /**
  * Gives {@link ICompletionProposal} for a given {@link IValidationResult}.
@@ -103,8 +105,8 @@
 			result = doSwitch(errorToComplete);
 		} else {
 			// no need for variables here since "expression variable" can't be valid
-			final Set<IType> possibleTypes = validationResult.getPossibleTypes(validationResult
-					.getAstResult().getAst());
+			final Set<IType> possibleTypes = validationResult.getPossibleTypes(validationResult.getAstResult()
+					.getAst());
 			result = getExpressionTextFollows(possibleTypes);
 		}
 
@@ -210,17 +212,14 @@
 	public List<ICompletionProposal> caseErrorTypeLiteral(ErrorTypeLiteral object) {
 		final List<ICompletionProposal> result = new ArrayList<ICompletionProposal>();
 
-		if (object.getSegments().size() == 0) {
-			result.add(new TextCompletionProposal("String", 0));
-			result.add(new TextCompletionProposal("Integer", 0));
-			result.add(new TextCompletionProposal("Real", 0));
-			result.add(new TextCompletionProposal("Boolean", 0));
-			result.add(new TextCompletionProposal("Sequence()", 1));
-			result.add(new TextCompletionProposal("OrderedSet()", 1));
-			result.add(new TextCompletionProposal("{}", 1));
-		}
-
-		result.addAll(getEClassifierCompletion(object));
+		result.add(new TextCompletionProposal("String", 0));
+		result.add(new TextCompletionProposal("Integer", 0));
+		result.add(new TextCompletionProposal("Real", 0));
+		result.add(new TextCompletionProposal("Boolean", 0));
+		result.add(new TextCompletionProposal("Sequence()", 1));
+		result.add(new TextCompletionProposal("OrderedSet()", 1));
+		result.add(new TextCompletionProposal("{}", 1));
+		result.addAll(getEClassifierCompletion(null, null, null));
 
 		return result;
 	}
@@ -232,28 +231,32 @@
 	 */
 	@Override
 	public List<ICompletionProposal> caseErrorEClassifierTypeLiteral(ErrorEClassifierTypeLiteral object) {
-		return getEClassifierCompletion(object);
+		return getEClassifierCompletion(object.getEPackageName(), object.getEClassifierName(), null);
 	}
 
 	/**
 	 * Gets the {@link List} of {@link ICompletionProposal} for the given {@link ErrorTypeLiteral}.
 	 * 
-	 * @param errorTypeLiteral
-	 *            the {@link ErrorTypeLiteral} to complete
+	 * @param ePackageName
+	 *            the {@link EPackage#getName() ePackageName}
+	 * @param eClassifierName
+	 *            the {@link EClassifier#getName() ePackageName}
+	 * @param eEnumLiteralName
+	 *            the {@link ErrorEnumLiteral#getName() ePackageName}
 	 * @return the {@link List} of {@link ICompletionProposal} for the given {@link ErrorTypeLiteral}
 	 */
-	protected List<ICompletionProposal> getEClassifierCompletion(ErrorTypeLiteral errorTypeLiteral) {
+	protected List<ICompletionProposal> getEClassifierCompletion(String ePackageName, String eClassifierName,
+			String eEnumLiteralName) {
 		final List<ICompletionProposal> result = new ArrayList<ICompletionProposal>();
 
-		if (errorTypeLiteral.getSegments().size() == 0) {
+		if (ePackageName == null) {
 			result.addAll(services.getEClassifierProposals());
 			result.addAll(services.getEEnumLiteralProposals());
-		} else if (errorTypeLiteral.getSegments().size() == 1) {
-			result.addAll(services.getEClassifierProposals(errorTypeLiteral.getSegments().get(0)));
-			result.addAll(services.getEEnumLiteralProposals(errorTypeLiteral.getSegments().get(0)));
-		} else if (errorTypeLiteral.getSegments().size() == 2) {
-			result.addAll(services.getEEnumLiteralProposals(errorTypeLiteral.getSegments().get(0),
-					errorTypeLiteral.getSegments().get(1)));
+		} else if (eClassifierName == null) {
+			result.addAll(services.getEClassifierProposals(ePackageName));
+			result.addAll(services.getEEnumLiteralProposals(ePackageName));
+		} else if (eEnumLiteralName == null) {
+			result.addAll(services.getEEnumLiteralProposals(ePackageName, eClassifierName));
 		}
 
 		return result;
@@ -268,8 +271,7 @@
 	public List<ICompletionProposal> caseErrorEnumLiteral(ErrorEnumLiteral object) {
 		final List<ICompletionProposal> result = new ArrayList<ICompletionProposal>();
 
-		result.addAll(services.getEEnumLiteralProposals(object.getSegments().get(0), object.getSegments()
-				.get(1)));
+		result.addAll(services.getEEnumLiteralProposals(object.getEPackageName(), object.getEEnumName()));
 
 		return result;
 	}
@@ -467,8 +469,8 @@
 	 * 
 	 * @param possibleTypes
 	 *            possible types of the {@link org.eclipse.acceleo.query.ast.Expression Expression}
-	 * @return the {@link TextCompletionProposal} following an
-	 *         {@link org.eclipse.acceleo.query.ast.Expression Expression}
+	 * @return the {@link TextCompletionProposal} following an {@link org.eclipse.acceleo.query.ast.Expression
+	 *         Expression}
 	 */
 	private List<ICompletionProposal> getExpressionTextFollows(Set<IType> possibleTypes) {
 		final List<ICompletionProposal> result = new ArrayList<ICompletionProposal>();
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstEvaluator.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstEvaluator.java
index b83cc5a..af570e5 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstEvaluator.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstEvaluator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -23,7 +23,9 @@
 import org.eclipse.acceleo.query.ast.Binding;
 import org.eclipse.acceleo.query.ast.BooleanLiteral;
 import org.eclipse.acceleo.query.ast.Call;
+import org.eclipse.acceleo.query.ast.ClassTypeLiteral;
 import org.eclipse.acceleo.query.ast.Conditional;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
 import org.eclipse.acceleo.query.ast.EnumLiteral;
 import org.eclipse.acceleo.query.ast.Expression;
 import org.eclipse.acceleo.query.ast.Implies;
@@ -47,6 +49,8 @@
 import org.eclipse.acceleo.query.runtime.impl.Nothing;
 import org.eclipse.emf.common.util.BasicDiagnostic;
 import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnumLiteral;
 
 /**
  * Evaluates the asts.
@@ -180,16 +184,29 @@
 		return object.getValue();
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseTypeLiteral(org.eclipse.acceleo.query.ast.TypeLiteral)
-	 */
 	@Override
-	public Object caseTypeLiteral(TypeLiteral object) {
+	public Object caseClassTypeLiteral(ClassTypeLiteral object) {
 		return object.getValue();
 	}
 
+	@Override
+	public Object caseEClassifierTypeLiteral(EClassifierTypeLiteral object) {
+		final Object result;
+
+		final EClassifier eClassifier = services.getEClassifier(object);
+		if (eClassifier != null) {
+			result = eClassifier;
+		} else {
+			final Nothing nothing = new Nothing("Invalid classifier.");
+			Diagnostic diag = new BasicDiagnostic(Diagnostic.ERROR, AstBuilderListener.PLUGIN_ID, 0, nothing
+					.getMessage(), new Object[] {object });
+			((BasicDiagnostic)diagnostic).add(diag);
+			result = nothing;
+		}
+
+		return result;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 *
@@ -328,8 +345,9 @@
 	public Object caseEnumLiteral(EnumLiteral object) {
 		final Object result;
 
-		if (object.getLiteral() != null) {
-			result = object.getLiteral().getInstance();
+		final EEnumLiteral literal = services.getEEnumLiteral(object);
+		if (literal != null) {
+			result = literal.getInstance();
 		} else {
 			final Nothing nothing = new Nothing("Invalid enum literal.");
 			Diagnostic diag = new BasicDiagnostic(Diagnostic.ERROR, AstBuilderListener.PLUGIN_ID, 0, nothing
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstSerializer.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstSerializer.java
index 945fd25..e924753 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstSerializer.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstSerializer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Obeo.
+ * Copyright (c) 2020, 2021 Obeo.
  * 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
@@ -20,8 +20,10 @@
 import org.eclipse.acceleo.query.ast.BooleanLiteral;
 import org.eclipse.acceleo.query.ast.Call;
 import org.eclipse.acceleo.query.ast.CallType;
+import org.eclipse.acceleo.query.ast.ClassTypeLiteral;
 import org.eclipse.acceleo.query.ast.CollectionTypeLiteral;
 import org.eclipse.acceleo.query.ast.Conditional;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
 import org.eclipse.acceleo.query.ast.EnumLiteral;
 import org.eclipse.acceleo.query.ast.Expression;
 import org.eclipse.acceleo.query.ast.IntegerLiteral;
@@ -37,9 +39,6 @@
 import org.eclipse.acceleo.query.ast.VarRef;
 import org.eclipse.acceleo.query.ast.VariableDeclaration;
 import org.eclipse.acceleo.query.ast.util.AstSwitch;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.impl.EClassifierImpl;
 
 /**
  * Serialize a {@link Expression}.
@@ -74,11 +73,6 @@
 	private StringBuilder builder;
 
 	/**
-	 * The mapping form nsURI to name.
-	 */
-	private final Map<String, String> ePackagesURItoName = new HashMap<>();
-
-	/**
 	 * Serializes the given {@link Expression}.
 	 * 
 	 * @param expression
@@ -719,24 +713,11 @@
 
 	@Override
 	public Object caseEnumLiteral(EnumLiteral enumLiteral) {
-		if (!enumLiteral.getLiteral().eIsProxy()) {
-			builder.append(enumLiteral.getLiteral().getEEnum().getEPackage().getName());
-			builder.append(ECORE_SEPARATOR);
-			builder.append(enumLiteral.getLiteral().getEEnum().getName());
-			builder.append(ECORE_SEPARATOR);
-			builder.append(enumLiteral.getLiteral().getName());
-		} else {
-			final URI proxyURI = ((org.eclipse.emf.ecore.impl.EEnumLiteralImpl)enumLiteral.getLiteral())
-					.eProxyURI();
-			final String packageName = ePackagesURItoName.getOrDefault(removeFragment(proxyURI),
-					"packageName");
-			final String[] segments = proxyURI.fragment().split("/");
-			builder.append(packageName);
-			builder.append(ECORE_SEPARATOR);
-			builder.append(segments[segments.length - 2]);
-			builder.append(ECORE_SEPARATOR);
-			builder.append(segments[segments.length - 1]);
-		}
+		builder.append(enumLiteral.getEPackageName());
+		builder.append(ECORE_SEPARATOR);
+		builder.append(enumLiteral.getEEnumName());
+		builder.append(ECORE_SEPARATOR);
+		builder.append(enumLiteral.getEEnumLiteralName());
 
 		return DUMMY;
 	}
@@ -901,36 +882,23 @@
 	}
 
 	@Override
-	public Object caseTypeLiteral(TypeLiteral object) {
-		if (!(object instanceof TypeSetLiteral) && !(object instanceof CollectionTypeLiteral)) {
-			if (object.getValue() instanceof Class) {
-				if (object.getValue() == Double.class) {
-					builder.append("Real");
-				} else {
-					builder.append(((Class<?>)object.getValue()).getSimpleName());
-				}
-			} else if (object.getValue() instanceof EClassifier) {
-				final EClassifier eClassifier = (EClassifier)object.getValue();
-				if (!eClassifier.eIsProxy()) {
-					builder.append(eClassifier.getEPackage().getName());
-					builder.append(ECORE_SEPARATOR);
-					builder.append(eClassifier.getName());
-				} else {
-					final URI proxyURI = ((EClassifierImpl)eClassifier).eProxyURI();
-					final String[] segments = proxyURI.fragment().split("/");
-					ePackagesURItoName.put(removeFragment(proxyURI), segments[segments.length - 2]);
-					builder.append(segments[segments.length - 2]);
-					builder.append(ECORE_SEPARATOR);
-					builder.append(segments[segments.length - 1]);
-				}
-			}
+	public Object caseClassTypeLiteral(ClassTypeLiteral classTypeLiteral) {
+		if (classTypeLiteral.getValue() == Double.class) {
+			builder.append("Real");
+		} else {
+			builder.append(((Class<?>)classTypeLiteral.getValue()).getSimpleName());
 		}
 
 		return DUMMY;
 	}
 
-	private String removeFragment(URI uri) {
-		return uri.toString().substring(0, uri.toString().length() - uri.fragment().length());
+	@Override
+	public Object caseEClassifierTypeLiteral(EClassifierTypeLiteral object) {
+		builder.append(object.getEPackageName());
+		builder.append(ECORE_SEPARATOR);
+		builder.append(object.getEClassifierName());
+
+		return DUMMY;
 	}
 
 	@Override
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstValidator.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstValidator.java
index 550850e..25f5c94 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstValidator.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2020 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -12,6 +12,7 @@
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.HashMap;
@@ -24,8 +25,10 @@
 import org.eclipse.acceleo.query.ast.Binding;
 import org.eclipse.acceleo.query.ast.BooleanLiteral;
 import org.eclipse.acceleo.query.ast.Call;
+import org.eclipse.acceleo.query.ast.ClassTypeLiteral;
 import org.eclipse.acceleo.query.ast.CollectionTypeLiteral;
 import org.eclipse.acceleo.query.ast.Conditional;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
 import org.eclipse.acceleo.query.ast.EnumLiteral;
 import org.eclipse.acceleo.query.ast.ErrorBinding;
 import org.eclipse.acceleo.query.ast.ErrorCall;
@@ -68,6 +71,7 @@
 import org.eclipse.acceleo.query.validation.type.SetType;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnumLiteral;
 
 /**
  * Validates an {@link org.eclipse.acceleo.query.ast.Expression Expression}.
@@ -97,6 +101,16 @@
 	private static final String SHOULD_NEVER_HAPPEN = "should never happen";
 
 	/**
+	 * Ambiguous {@link EEnumLiteral} message.
+	 */
+	private static final String AMBIGUOUS_ENUM_LITERAL = "several enumliterals are matching the literal name: %s, eenum : %s and package name : %s";
+
+	/**
+	 * Ambiguous {@link EClassifier} message.
+	 */
+	private static final String AMBIGUOUS_TYPE_LITERAL = "several types are matching the EClassifier name: %s , package name : %s";
+
+	/**
 	 * The {@link ValidationResult}.
 	 */
 	protected ValidationResult validationResult;
@@ -265,11 +279,6 @@
 		return startPostion;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseBooleanLiteral(org.eclipse.acceleo.query.ast.BooleanLiteral)
-	 */
 	@Override
 	public Set<IType> caseBooleanLiteral(BooleanLiteral object) {
 		final Set<IType> possibleTypes = new LinkedHashSet<IType>();
@@ -279,11 +288,6 @@
 		return checkWarningsAndErrors(object, possibleTypes);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseCall(org.eclipse.acceleo.query.ast.Call)
-	 */
 	@Override
 	public Set<IType> caseCall(Call call) {
 		final Set<IType> possibleTypes;
@@ -745,11 +749,6 @@
 		return result;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseCollectionTypeLiteral(org.eclipse.acceleo.query.ast.CollectionTypeLiteral)
-	 */
 	@Override
 	public Set<IType> caseCollectionTypeLiteral(CollectionTypeLiteral object) {
 		final Set<IType> possibleTypes = new LinkedHashSet<IType>();
@@ -767,24 +766,25 @@
 		return checkWarningsAndErrors(object, possibleTypes);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseEnumLiteral(org.eclipse.acceleo.query.ast.EnumLiteral)
-	 */
 	@Override
 	public Set<IType> caseEnumLiteral(EnumLiteral object) {
 		final Set<IType> possibleTypes = new LinkedHashSet<IType>();
-		possibleTypes.add(new EClassifierType(services.getQueryEnvironment(), object.getLiteral()
-				.getEEnum()));
+		final IReadOnlyQueryEnvironment queryEnvironment = services.getQueryEnvironment();
+		final Collection<EEnumLiteral> literals = queryEnvironment.getEPackageProvider().getEnumLiterals(
+				object.getEPackageName(), object.getEEnumName(), object.getEEnumLiteralName());
+
+		if (literals.isEmpty()) {
+			possibleTypes.add(services.nothing("invalid enum literal: no literal registered with this name"));
+		} else if (literals.size() > 1) {
+			possibleTypes.add(services.nothing(AMBIGUOUS_ENUM_LITERAL, object.getEEnumLiteralName(), object
+					.getEEnumName(), object.getEPackageName()));
+		} else {
+			possibleTypes.add(new EClassifierType(queryEnvironment, literals.iterator().next().getEEnum()));
+		}
+
 		return checkWarningsAndErrors(object, possibleTypes);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseIntegerLiteral(org.eclipse.acceleo.query.ast.IntegerLiteral)
-	 */
 	@Override
 	public Set<IType> caseIntegerLiteral(IntegerLiteral object) {
 		final Set<IType> possibleTypes = new LinkedHashSet<IType>();
@@ -794,11 +794,6 @@
 		return checkWarningsAndErrors(object, possibleTypes);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseLambda(org.eclipse.acceleo.query.ast.Lambda)
-	 */
 	@Override
 	public Set<IType> caseLambda(Lambda object) {
 		final Set<IType> lambdaExpressionTypes = new LinkedHashSet<IType>();
@@ -828,11 +823,6 @@
 		return lambdaExpressionTypes;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseRealLiteral(org.eclipse.acceleo.query.ast.RealLiteral)
-	 */
 	@Override
 	public Set<IType> caseRealLiteral(RealLiteral object) {
 		final Set<IType> possibleTypes = new LinkedHashSet<IType>();
@@ -842,11 +832,6 @@
 		return checkWarningsAndErrors(object, possibleTypes);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseStringLiteral(org.eclipse.acceleo.query.ast.StringLiteral)
-	 */
 	@Override
 	public Set<IType> caseStringLiteral(StringLiteral object) {
 		final Set<IType> possibleTypes = new LinkedHashSet<IType>();
@@ -856,11 +841,6 @@
 		return checkWarningsAndErrors(object, possibleTypes);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseVarRef(org.eclipse.acceleo.query.ast.VarRef)
-	 */
 	@Override
 	public Set<IType> caseVarRef(VarRef object) {
 		final Set<IType> variableTypes = services.getVariableTypes(peekVariableTypes(), object
@@ -889,35 +869,35 @@
 		return validationResult;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseTypeLiteral(org.eclipse.acceleo.query.ast.TypeLiteral)
-	 */
 	@Override
-	public Set<IType> caseTypeLiteral(TypeLiteral object) {
-		final Set<IType> possibleTypes;
+	public Set<IType> caseClassTypeLiteral(ClassTypeLiteral object) {
+		final Set<IType> possibleTypes = new LinkedHashSet<IType>();
 
-		if (object.getValue() instanceof EClassifier) {
-			possibleTypes = new LinkedHashSet<IType>();
-			possibleTypes.add(new EClassifierLiteralType(services.getQueryEnvironment(), (EClassifier)object
-					.getValue()));
-		} else if (object.getValue() instanceof Class<?>) {
-			possibleTypes = new LinkedHashSet<IType>();
-			possibleTypes.add(new ClassLiteralType(services.getQueryEnvironment(), (Class<?>)object
-					.getValue()));
+		possibleTypes.add(new ClassLiteralType(services.getQueryEnvironment(), object.getValue()));
+
+		return checkWarningsAndErrors(object, possibleTypes);
+	}
+
+	@Override
+	public Set<IType> caseEClassifierTypeLiteral(EClassifierTypeLiteral object) {
+		final Set<IType> possibleTypes = new LinkedHashSet<IType>();
+
+		final IReadOnlyQueryEnvironment queryEnvironment = services.getQueryEnvironment();
+		final Collection<EClassifier> eClassifiers = queryEnvironment.getEPackageProvider().getTypes(object
+				.getEPackageName(), object.getEClassifierName());
+		if (eClassifiers.isEmpty()) {
+			possibleTypes.add(services.nothing(AstBuilderListener.INVALID_TYPE_LITERAL, object
+					.getEPackageName() + "::" + object.getEClassifierName()));
+		} else if (eClassifiers.size() > 1) {
+			possibleTypes.add(services.nothing(AMBIGUOUS_TYPE_LITERAL, object.getEClassifierName(), object
+					.getEPackageName()));
 		} else {
-			throw new UnsupportedOperationException(SHOULD_NEVER_HAPPEN);
+			possibleTypes.add(new EClassifierLiteralType(queryEnvironment, eClassifiers.iterator().next()));
 		}
 
 		return checkWarningsAndErrors(object, possibleTypes);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseTypeSetLiteral(org.eclipse.acceleo.query.ast.TypeSetLiteral)
-	 */
 	@Override
 	public Set<IType> caseTypeSetLiteral(TypeSetLiteral object) {
 		final Set<IType> possibleTypes = new LinkedHashSet<IType>();
@@ -927,21 +907,22 @@
 		possibleTypes.add(possibleType);
 
 		for (TypeLiteral type : object.getTypes()) {
-			if (!types.add((EClassifier)type.getValue())) {
-				possibleTypes.add(services.nothing(
-						"EClassifierLiteral=%s is duplicated in the type set literal.", ((EClassifier)type
-								.getValue()).getName()));
+			final Set<IType> childTypes = doSwitch(type);
+			for (IType childType : childTypes) {
+				if (childType.getType() instanceof EClassifier) {
+					final EClassifier eClassifier = (EClassifier)childType.getType();
+					if (!types.add(eClassifier)) {
+						possibleTypes.add(services.nothing(
+								"EClassifierLiteral=%s is duplicated in the type set literal.", eClassifier
+										.getName()));
+					}
+				}
 			}
 		}
 
 		return checkWarningsAndErrors(object, possibleTypes);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseErrorCall(org.eclipse.acceleo.query.ast.ErrorCall)
-	 */
 	@Override
 	public Set<IType> caseErrorCall(ErrorCall object) {
 		for (Expression arg : object.getArguments()) {
@@ -950,51 +931,26 @@
 		return checkWarningsAndErrors(object, services.getErrorTypes(validationResult, object));
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseErrorExpression(org.eclipse.acceleo.query.ast.ErrorExpression)
-	 */
 	@Override
 	public Set<IType> caseErrorExpression(ErrorExpression object) {
 		return checkWarningsAndErrors(object, services.getErrorTypes(validationResult, object));
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseErrorTypeLiteral(org.eclipse.acceleo.query.ast.ErrorTypeLiteral)
-	 */
 	@Override
 	public Set<IType> caseErrorTypeLiteral(ErrorTypeLiteral object) {
 		return checkWarningsAndErrors(object, services.getErrorTypes(validationResult, object));
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseErrorEClassifierTypeLiteral(org.eclipse.acceleo.query.ast.ErrorEClassifierTypeLiteral)
-	 */
 	@Override
 	public Set<IType> caseErrorEClassifierTypeLiteral(ErrorEClassifierTypeLiteral object) {
 		return checkWarningsAndErrors(object, services.getErrorTypes(validationResult, object));
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseErrorEnumLiteral(org.eclipse.acceleo.query.ast.ErrorEnumLiteral)
-	 */
 	@Override
 	public Set<IType> caseErrorEnumLiteral(ErrorEnumLiteral object) {
 		return checkWarningsAndErrors(object, services.getErrorTypes(validationResult, object));
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseNullLiteral(org.eclipse.acceleo.query.ast.NullLiteral)
-	 */
 	@Override
 	public Set<IType> caseNullLiteral(NullLiteral object) {
 		final Set<IType> possibleTypes = new LinkedHashSet<IType>();
@@ -1004,11 +960,6 @@
 		return checkWarningsAndErrors(object, possibleTypes);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseSetInExtensionLiteral(org.eclipse.acceleo.query.ast.SetInExtensionLiteral)
-	 */
 	@Override
 	public Set<IType> caseSetInExtensionLiteral(SetInExtensionLiteral object) {
 		final Set<IType> possibleTypes = new LinkedHashSet<IType>();
@@ -1027,11 +978,6 @@
 		return checkWarningsAndErrors(object, possibleTypes);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseSequenceInExtensionLiteral(org.eclipse.acceleo.query.ast.SequenceInExtensionLiteral)
-	 */
 	@Override
 	public Set<IType> caseSequenceInExtensionLiteral(SequenceInExtensionLiteral object) {
 		final Set<IType> possibleTypes = new LinkedHashSet<IType>();
@@ -1050,11 +996,6 @@
 		return checkWarningsAndErrors(object, possibleTypes);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseVariableDeclaration(org.eclipse.acceleo.query.ast.VariableDeclaration)
-	 */
 	@Override
 	public Set<IType> caseVariableDeclaration(VariableDeclaration variableDeclaration) {
 		final Set<IType> result = new LinkedHashSet<IType>();
@@ -1108,11 +1049,6 @@
 		return result;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseConditional(org.eclipse.acceleo.query.ast.Conditional)
-	 */
 	@Override
 	public Set<IType> caseConditional(Conditional object) {
 		Set<IType> result = new LinkedHashSet<IType>();
@@ -1184,11 +1120,6 @@
 		return checkWarningsAndErrors(object, result);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseLet(org.eclipse.acceleo.query.ast.Let)
-	 */
 	@Override
 	public Set<IType> caseLet(Let object) {
 		Set<IType> result = new LinkedHashSet<IType>();
@@ -1215,11 +1146,6 @@
 		return checkWarningsAndErrors(object, result);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseBinding(org.eclipse.acceleo.query.ast.Binding)
-	 */
 	@Override
 	public Set<IType> caseBinding(Binding binding) {
 		final Set<IType> expressionTypes = doSwitch(binding.getValue());
@@ -1296,11 +1222,6 @@
 		return res;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.acceleo.query.ast.util.AstSwitch#caseErrorBinding(org.eclipse.acceleo.query.ast.ErrorBinding)
-	 */
 	@Override
 	public Set<IType> caseErrorBinding(ErrorBinding object) {
 		final Set<IType> result;
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/QueryAstSerializer.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/QueryAstSerializer.java
index 0b2085c..ed6f051 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/QueryAstSerializer.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/QueryAstSerializer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016 Obeo.
+ * Copyright (c) 2016, 2021 Obeo.
  * 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
@@ -142,11 +142,11 @@
 
 	@Override
 	public Void caseEnumLiteral(EnumLiteral enumLiteral) {
-		builder.append(enumLiteral.getLiteral().getEEnum().getEPackage().getName());
+		builder.append(enumLiteral.getEPackageName());
 		builder.append("::");
-		builder.append(enumLiteral.getLiteral().getEEnum().getName());
+		builder.append(enumLiteral.getEEnumName());
 		builder.append("::");
-		builder.append(enumLiteral.getLiteral().getName());
+		builder.append(enumLiteral.getEEnumLiteralName());
 		return null;
 	}
 
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/QueryParsing.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/QueryParsing.java
index d6c7a4d..94950fe 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/QueryParsing.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/QueryParsing.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -31,9 +31,19 @@
 	 *            the query environment to use.
 	 * @return a new {@link IQueryBuilderEngine} suitable for parsing {@link String} instances into the given
 	 *         {@link IQueryEnvironment}.
+	 * @deprecated see {@link #newBuilder()}
 	 */
 	public static IQueryBuilderEngine newBuilder(IQueryEnvironment environment) {
-		return new QueryBuilderEngine(environment);
+		return newBuilder();
+	}
+
+	/**
+	 * Create a new {@link IQueryBuilderEngine} suitable for parsing {@link String} instances.
+	 * 
+	 * @return a new {@link IQueryBuilderEngine} suitable for parsing {@link String} instances.
+	 */
+	public static IQueryBuilderEngine newBuilder() {
+		return new QueryBuilderEngine();
 	}
 
 }
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/EvaluationServices.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/EvaluationServices.java
index ff3ca0b..35996c8 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/EvaluationServices.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/EvaluationServices.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -17,6 +17,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
+import org.eclipse.acceleo.query.ast.EnumLiteral;
 import org.eclipse.acceleo.query.parser.AstBuilderListener;
 import org.eclipse.acceleo.query.runtime.AcceleoQueryEvaluationException;
 import org.eclipse.acceleo.query.runtime.IReadOnlyQueryEnvironment;
@@ -27,6 +29,8 @@
 import org.eclipse.emf.common.util.BasicDiagnostic;
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnumLiteral;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -402,4 +406,47 @@
 			((DiagnosticChain)chain).add(child);
 		}
 	}
+
+	/**
+	 * Gets the {@link EClassifier} for the given {@link EClassifierTypeLiteral}.
+	 * 
+	 * @param eClassifierTypeLiteral
+	 *            the {@link EClassifierTypeLiteral}
+	 * @return the {@link EClassifier} for the given {@link EClassifierTypeLiteral} if any, <code>null</code>
+	 *         otherwise
+	 */
+	public EClassifier getEClassifier(EClassifierTypeLiteral eClassifierTypeLiteral) {
+		final EClassifier result;
+
+		final Collection<EClassifier> eClassifiers = queryEnvironment.getEPackageProvider().getTypes(
+				eClassifierTypeLiteral.getEPackageName(), eClassifierTypeLiteral.getEClassifierName());
+		if (eClassifiers.isEmpty()) {
+			result = null;
+		} else {
+			result = eClassifiers.iterator().next();
+		}
+
+		return result;
+	}
+
+	/**
+	 * Gets the {@link EEnumLiteral} for the given {@link EnumLiteral}.
+	 * 
+	 * @param enumLiteral
+	 *            the {@link EnumLiteral}
+	 * @return the {@link EEnumLiteral} for the given {@link EnumLiteral} if any, <code>null</code> otherwise
+	 */
+	public EEnumLiteral getEEnumLiteral(EnumLiteral enumLiteral) {
+		final EEnumLiteral result;
+
+		final Collection<EEnumLiteral> literals = queryEnvironment.getEPackageProvider().getEnumLiterals(
+				enumLiteral.getEPackageName(), enumLiteral.getEEnumName(), enumLiteral.getEEnumLiteralName());
+		if (literals.isEmpty()) {
+			result = null;
+		} else {
+			result = literals.iterator().next();
+		}
+
+		return result;
+	}
 }
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/QueryBuilderEngine.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/QueryBuilderEngine.java
index b7be5d7..0686136 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/QueryBuilderEngine.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/QueryBuilderEngine.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -46,18 +46,20 @@
 public class QueryBuilderEngine implements IQueryBuilderEngine {
 
 	/**
-	 * The environment containing all necessary information and used to execute query services.
-	 */
-	private IReadOnlyQueryEnvironment queryEnvironment;
-
-	/**
 	 * Constructor. It takes an IQueryEnvironment as parameter.
 	 * 
 	 * @param queryEnvironment
 	 *            The environment containing all necessary information and used to execute query services.
+	 * @deprecated see {@link #QueryBuilderEngine()}
 	 */
 	public QueryBuilderEngine(IReadOnlyQueryEnvironment queryEnvironment) {
-		this.queryEnvironment = queryEnvironment;
+		this();
+	}
+
+	/**
+	 * Constructor.
+	 */
+	public QueryBuilderEngine() {
 	}
 
 	@Override
@@ -65,7 +67,7 @@
 		final AstResult result;
 
 		if (expression != null && expression.length() > 0) {
-			AstBuilderListener astBuilder = new AstBuilderListener(queryEnvironment);
+			AstBuilderListener astBuilder = new AstBuilderListener();
 			CharStream input = new UnbufferedCharStream(new StringReader(expression), expression.length());
 			QueryLexer lexer = new QueryLexer(input);
 			lexer.setTokenFactory(new CommonTokenFactory(true));
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/QueryValidationEngine.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/QueryValidationEngine.java
index d22c9cf..3f3ec52 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/QueryValidationEngine.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/QueryValidationEngine.java
@@ -50,7 +50,7 @@
 	 */
 	@Override
 	public IValidationResult validate(String expression, Map<String, Set<IType>> variableTypes) {
-		IQueryBuilderEngine builder = new QueryBuilderEngine(queryEnvironment);
+		IQueryBuilderEngine builder = new QueryBuilderEngine();
 		AstResult build = builder.build(expression);
 		final AstValidator validator = new AstValidator(new ValidationServices(queryEnvironment));
 		return validator.validate(variableTypes, build);
diff --git a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/ast/test/AstBuilderTest.java b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/ast/test/AstBuilderTest.java
index 345d5fb..a8ca08e 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/ast/test/AstBuilderTest.java
+++ b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/ast/test/AstBuilderTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -10,20 +10,18 @@
  *******************************************************************************/
 package org.eclipse.acceleo.query.ast.test;
 
-import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Set;
 
 import org.eclipse.acceleo.query.ast.BooleanLiteral;
 import org.eclipse.acceleo.query.ast.Call;
 import org.eclipse.acceleo.query.ast.CallType;
+import org.eclipse.acceleo.query.ast.ClassTypeLiteral;
 import org.eclipse.acceleo.query.ast.CollectionTypeLiteral;
 import org.eclipse.acceleo.query.ast.IntegerLiteral;
 import org.eclipse.acceleo.query.ast.NullLiteral;
 import org.eclipse.acceleo.query.ast.RealLiteral;
 import org.eclipse.acceleo.query.ast.StringLiteral;
 import org.eclipse.acceleo.query.ast.TypeLiteral;
-import org.eclipse.acceleo.query.ast.TypeSetLiteral;
 import org.eclipse.acceleo.query.ast.VarRef;
 import org.eclipse.acceleo.query.parser.AstBuilder;
 import org.eclipse.acceleo.query.parser.AstBuilderListener;
@@ -92,7 +90,7 @@
 		AstBuilder builder = new AstBuilder();
 		CollectionTypeLiteral literal = builder.collectionTypeLiteral(List.class, (TypeLiteral)builder
 				.typeLiteral(Integer.class));
-		assertEquals(Integer.class, literal.getElementType().getValue());
+		assertEquals(Integer.class, ((ClassTypeLiteral)literal.getElementType()).getValue());
 		assertEquals(List.class, literal.getValue());
 	}
 
@@ -101,20 +99,8 @@
 	 */
 	@Test
 	public void testTypeLiteral() {
-		assertEquals(Integer.class, ((TypeLiteral)new AstBuilder().typeLiteral(Integer.class)).getValue());
-	}
-
-	@Test
-	public void testTypeLiteralSet() {
-		Set<Class<?>> classeInSet = new LinkedHashSet<Class<?>>();
-		classeInSet.add(Integer.class);
-		assertEquals(Integer.class, ((TypeLiteral)new AstBuilder().typeLiteral(classeInSet)).getValue());
-
-		classeInSet.add(String.class);
-		assertEquals(Integer.class, ((TypeSetLiteral)new AstBuilder().typeLiteral(classeInSet)).getTypes()
-				.get(0).getValue());
-		assertEquals(String.class, ((TypeSetLiteral)new AstBuilder().typeLiteral(classeInSet)).getTypes().get(
-				1).getValue());
+		assertEquals(Integer.class, ((ClassTypeLiteral)new AstBuilder().typeLiteral(Integer.class))
+				.getValue());
 	}
 
 	/**
diff --git a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/ast/test/AstEvaluatorTest.java b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/ast/test/AstEvaluatorTest.java
index 0f68817..67b7136 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/ast/test/AstEvaluatorTest.java
+++ b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/ast/test/AstEvaluatorTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -159,8 +159,8 @@
 	@Test
 	public void testTypeLiteral() {
 		Map<String, Object> varDefinitions = new HashMap<String, Object>();
-		assertOKResultEquals(EcorePackage.Literals.ECLASS, evaluator.eval(varDefinitions, typeLiteral(
-				EcorePackage.Literals.ECLASS)));
+		assertOKResultEquals(EcorePackage.Literals.ECLASS, evaluator.eval(varDefinitions,
+				eClassifierTypeLiteral(EcorePackage.eNAME, EcorePackage.Literals.ECLASS.getName())));
 		assertOKResultEquals(Integer.class, evaluator.eval(varDefinitions, typeLiteral(Integer.class)));
 	}
 
@@ -362,12 +362,15 @@
 	}
 
 	@Test
-	public void testTypeSetLiteral() {
+	public void testeClassifierTypeLiteral() {
 
 		final List<TypeLiteral> types = new ArrayList<TypeLiteral>();
-		types.add((TypeLiteral)typeLiteral(EcorePackage.eINSTANCE.getEClass()));
-		types.add((TypeLiteral)typeLiteral(EcorePackage.eINSTANCE.getEPackage()));
-		types.add((TypeLiteral)typeLiteral(EcorePackage.eINSTANCE.getEAttribute()));
+		types.add((TypeLiteral)eClassifierTypeLiteral(EcorePackage.eNAME, EcorePackage.eINSTANCE.getEClass()
+				.getName()));
+		types.add((TypeLiteral)eClassifierTypeLiteral(EcorePackage.eNAME, EcorePackage.eINSTANCE.getEPackage()
+				.getName()));
+		types.add((TypeLiteral)eClassifierTypeLiteral(EcorePackage.eNAME, EcorePackage.eINSTANCE
+				.getEAttribute().getName()));
 		Map<String, Object> varDefinitions = new HashMap<String, Object>();
 		final EvaluationResult result = evaluator.eval(varDefinitions, typeSetLiteral(types));
 		assertTrue(result.getResult() instanceof Set);
diff --git a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/AstSerializerTests.java b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/AstSerializerTests.java
index e3f78eb..e46190f 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/AstSerializerTests.java
+++ b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/AstSerializerTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Obeo.
+ * Copyright (c) 2020, 2021 Obeo.
  * 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
@@ -15,7 +15,6 @@
 
 import org.eclipse.acceleo.query.ast.Expression;
 import org.eclipse.acceleo.query.parser.AstSerializer;
-import org.eclipse.acceleo.query.runtime.Query;
 import org.eclipse.acceleo.query.runtime.impl.QueryBuilderEngine;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,8 +34,7 @@
 	/**
 	 * The {@link QueryBuilderEngine}.
 	 */
-	private static final QueryBuilderEngine ENGINE = new QueryBuilderEngine(Query
-			.newEnvironmentWithDefaultServices(null));
+	private static final QueryBuilderEngine ENGINE = new QueryBuilderEngine();
 
 	/**
 	 * The {@link AstSerializer} to test.
diff --git a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/BuildTest.java b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/BuildTest.java
index 4e67814..7dbef06 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/BuildTest.java
+++ b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/BuildTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -17,12 +17,15 @@
 import org.eclipse.acceleo.query.ast.BooleanLiteral;
 import org.eclipse.acceleo.query.ast.Call;
 import org.eclipse.acceleo.query.ast.CallType;
+import org.eclipse.acceleo.query.ast.ClassTypeLiteral;
 import org.eclipse.acceleo.query.ast.CollectionTypeLiteral;
 import org.eclipse.acceleo.query.ast.Conditional;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
 import org.eclipse.acceleo.query.ast.EnumLiteral;
 import org.eclipse.acceleo.query.ast.ErrorBinding;
 import org.eclipse.acceleo.query.ast.ErrorCall;
 import org.eclipse.acceleo.query.ast.ErrorConditional;
+import org.eclipse.acceleo.query.ast.ErrorEClassifierTypeLiteral;
 import org.eclipse.acceleo.query.ast.ErrorEnumLiteral;
 import org.eclipse.acceleo.query.ast.ErrorExpression;
 import org.eclipse.acceleo.query.ast.ErrorStringLiteral;
@@ -69,7 +72,7 @@
 		queryEnvironment = Query.newEnvironmentWithDefaultServices(null);
 		queryEnvironment.registerEPackage(EcorePackage.eINSTANCE);
 		queryEnvironment.registerEPackage(AnydslPackage.eINSTANCE);
-		engine = new QueryBuilderEngine(queryEnvironment);
+		engine = new QueryBuilderEngine();
 	}
 
 	/**
@@ -755,11 +758,12 @@
 				.get(0));
 		assertEquals("var", ((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1)).getParameters()
 				.get(0)).getName());
-		assertExpression(build, TypeLiteral.class, 19, 0, 19, 32, 0, 32,
+		assertExpression(build, EClassifierTypeLiteral.class, 19, 0, 19, 32, 0, 32,
 				((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1)).getParameters().get(0))
 						.getType());
-		assertEquals(true, ((TypeLiteral)((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1))
-				.getParameters().get(0)).getType()).getValue() == EcorePackage.Literals.ECLASS);
+		assertEquals(EcorePackage.Literals.ECLASS.getName(),
+				((EClassifierTypeLiteral)((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1))
+						.getParameters().get(0)).getType()).getEClassifierName());
 		assertExpression(build, BooleanLiteral.class, 35, 0, 35, 39, 0, 39, ((Lambda)((Call)ast)
 				.getArguments().get(1)).getExpression());
 	}
@@ -894,8 +898,8 @@
 				.getArguments().get(1)).getElementType());
 		assertEquals(true, ((CollectionTypeLiteral)((Call)ast).getArguments().get(1))
 				.getValue() == List.class);
-		assertEquals(true, ((CollectionTypeLiteral)((Call)ast).getArguments().get(1)).getElementType()
-				.getValue() == String.class);
+		assertEquals(true, ((ClassTypeLiteral)((CollectionTypeLiteral)((Call)ast).getArguments().get(1))
+				.getElementType()).getValue() == String.class);
 		assertEquals(0, build.getErrors().size());
 		assertEquals(Diagnostic.OK, build.getDiagnostic().getSeverity());
 		assertEquals(0, build.getDiagnostic().getChildren().size());
@@ -917,8 +921,8 @@
 				.getValue() == Set.class);
 		assertExpression(build, TypeLiteral.class, 23, 0, 23, 29, 0, 29, ((CollectionTypeLiteral)((Call)ast)
 				.getArguments().get(1)).getElementType());
-		assertEquals(true, ((TypeLiteral)((CollectionTypeLiteral)((Call)ast).getArguments().get(1))
-				.getElementType()).getValue() == String.class);
+		assertEquals(true, ((ClassTypeLiteral)((TypeLiteral)((CollectionTypeLiteral)((Call)ast).getArguments()
+				.get(1)).getElementType())).getValue() == String.class);
 		assertEquals(0, build.getErrors().size());
 		assertEquals(Diagnostic.OK, build.getDiagnostic().getSeverity());
 		assertEquals(0, build.getDiagnostic().getChildren().size());
@@ -929,8 +933,9 @@
 		AstResult build = engine.build("ecore::EClass");
 		Expression ast = build.getAst();
 
-		assertExpression(build, TypeLiteral.class, 0, 0, 0, 13, 0, 13, ast);
-		assertEquals(EcorePackage.eINSTANCE.getEClass(), ((TypeLiteral)ast).getValue());
+		assertExpression(build, EClassifierTypeLiteral.class, 0, 0, 0, 13, 0, 13, ast);
+		assertEquals(EcorePackage.eINSTANCE.getEClass().getName(), ((EClassifierTypeLiteral)ast)
+				.getEClassifierName());
 		assertEquals(0, build.getErrors().size());
 		assertEquals(Diagnostic.OK, build.getDiagnostic().getSeverity());
 		assertEquals(0, build.getDiagnostic().getChildren().size());
@@ -941,8 +946,8 @@
 		AstResult build = engine.build("Integer");
 		Expression ast = build.getAst();
 
-		assertExpression(build, TypeLiteral.class, 0, 0, 0, 7, 0, 7, ast);
-		assertEquals(java.lang.Integer.class, ((TypeLiteral)ast).getValue());
+		assertExpression(build, ClassTypeLiteral.class, 0, 0, 0, 7, 0, 7, ast);
+		assertEquals(java.lang.Integer.class, ((ClassTypeLiteral)ast).getValue());
 		assertEquals(0, build.getErrors().size());
 		assertEquals(Diagnostic.OK, build.getDiagnostic().getSeverity());
 		assertEquals(0, build.getDiagnostic().getChildren().size());
@@ -953,8 +958,8 @@
 		AstResult build = engine.build("Real");
 		Expression ast = build.getAst();
 
-		assertExpression(build, TypeLiteral.class, 0, 0, 0, 4, 0, 4, ast);
-		assertEquals(java.lang.Double.class, ((TypeLiteral)ast).getValue());
+		assertExpression(build, ClassTypeLiteral.class, 0, 0, 0, 4, 0, 4, ast);
+		assertEquals(java.lang.Double.class, ((ClassTypeLiteral)ast).getValue());
 		assertEquals(0, build.getErrors().size());
 		assertEquals(Diagnostic.OK, build.getDiagnostic().getSeverity());
 		assertEquals(0, build.getDiagnostic().getChildren().size());
@@ -965,17 +970,11 @@
 		AstResult build = engine.build("anydsl::EClass");
 		Expression ast = build.getAst();
 
-		assertExpression(build, ErrorTypeLiteral.class, 0, 0, 0, 14, 0, 14, ast);
-		assertFalse(((ErrorTypeLiteral)ast).isMissingColon());
-		assertEquals("anydsl", ((ErrorTypeLiteral)ast).getSegments().get(0));
-		assertEquals("EClass", ((ErrorTypeLiteral)ast).getSegments().get(1));
-		assertEquals(1, build.getErrors().size());
-		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getSeverity());
-		assertEquals(1, build.getDiagnostic().getChildren().size());
-		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getChildren().get(0).getSeverity());
-		assertEquals("invalid type literal anydsl::EClass", build.getDiagnostic().getChildren().get(0)
-				.getMessage());
-		assertEquals(build.getErrors().get(0), build.getDiagnostic().getChildren().get(0).getData().get(0));
+		assertExpression(build, EClassifierTypeLiteral.class, 0, 0, 0, 14, 0, 14, ast);
+		assertEquals("anydsl", ((EClassifierTypeLiteral)ast).getEPackageName());
+		assertEquals("EClass", ((EClassifierTypeLiteral)ast).getEClassifierName());
+		assertEquals(0, build.getErrors().size());
+		assertEquals(Diagnostic.OK, build.getDiagnostic().getSeverity());
 	}
 
 	@Test
@@ -984,8 +983,8 @@
 		Expression ast = build.getAst();
 
 		assertExpression(build, EnumLiteral.class, 0, 0, 0, 19, 0, 19, ast);
-		assertEquals(AnydslPackage.eINSTANCE.getPart().getEEnumLiteral("Other"), ((EnumLiteral)ast)
-				.getLiteral());
+		assertEquals(AnydslPackage.eINSTANCE.getPart().getEEnumLiteral("Other").getName(), ((EnumLiteral)ast)
+				.getEEnumLiteralName());
 		assertEquals(0, build.getErrors().size());
 		assertEquals(Diagnostic.OK, build.getDiagnostic().getSeverity());
 		assertEquals(0, build.getDiagnostic().getChildren().size());
@@ -996,18 +995,12 @@
 		AstResult build = engine.build("anydsl::Part::NotExisting");
 		Expression ast = build.getAst();
 
-		assertExpression(build, ErrorEnumLiteral.class, 0, 0, 0, 25, 0, 25, ast);
-		assertFalse(((ErrorEnumLiteral)ast).isMissingColon());
-		assertEquals("anydsl", ((ErrorEnumLiteral)ast).getSegments().get(0));
-		assertEquals("Part", ((ErrorEnumLiteral)ast).getSegments().get(1));
-		assertEquals("NotExisting", ((ErrorEnumLiteral)ast).getSegments().get(2));
-		assertEquals(1, build.getErrors().size());
-		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getSeverity());
-		assertEquals(1, build.getDiagnostic().getChildren().size());
-		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getChildren().get(0).getSeverity());
-		assertEquals("invalid enum literal: no literal registered with this name", build.getDiagnostic()
-				.getChildren().get(0).getMessage());
-		assertEquals(build.getErrors().get(0), build.getDiagnostic().getChildren().get(0).getData().get(0));
+		assertExpression(build, EnumLiteral.class, 0, 0, 0, 25, 0, 25, ast);
+		assertEquals("anydsl", ((EnumLiteral)ast).getEPackageName());
+		assertEquals("Part", ((EnumLiteral)ast).getEEnumName());
+		assertEquals("NotExisting", ((EnumLiteral)ast).getEEnumLiteralName());
+		assertEquals(0, build.getErrors().size());
+		assertEquals(Diagnostic.OK, build.getDiagnostic().getSeverity());
 	}
 
 	@Test
@@ -1033,9 +1026,10 @@
 		assertEquals("precedingSiblings", ((Call)ast).getServiceName());
 		assertEquals(2, ((Call)ast).getArguments().size());
 		assertExpression(build, VarRef.class, 0, 0, 0, 4, 0, 4, ((Call)ast).getArguments().get(0));
-		assertExpression(build, TypeLiteral.class, 23, 0, 23, 36, 0, 36, ((Call)ast).getArguments().get(1));
-		final TypeLiteral typeLiteral = (TypeLiteral)((Call)ast).getArguments().get(1);
-		assertEquals(EcorePackage.eINSTANCE.getEClass(), typeLiteral.getValue());
+		assertExpression(build, EClassifierTypeLiteral.class, 23, 0, 23, 36, 0, 36, ((Call)ast).getArguments()
+				.get(1));
+		final EClassifierTypeLiteral typeLiteral = (EClassifierTypeLiteral)((Call)ast).getArguments().get(1);
+		assertEquals(EcorePackage.eINSTANCE.getEClass().getName(), typeLiteral.getEClassifierName());
 		assertEquals(0, build.getErrors().size());
 		assertEquals(Diagnostic.OK, build.getDiagnostic().getSeverity());
 		assertEquals(0, build.getDiagnostic().getChildren().size());
@@ -1050,9 +1044,10 @@
 		assertEquals("followingSiblings", ((Call)ast).getServiceName());
 		assertEquals(2, ((Call)ast).getArguments().size());
 		assertExpression(build, VarRef.class, 0, 0, 0, 4, 0, 4, ((Call)ast).getArguments().get(0));
-		assertExpression(build, TypeLiteral.class, 23, 0, 23, 36, 0, 36, ((Call)ast).getArguments().get(1));
-		final TypeLiteral typeLiteral = (TypeLiteral)((Call)ast).getArguments().get(1);
-		assertEquals(EcorePackage.eINSTANCE.getEClass(), typeLiteral.getValue());
+		assertExpression(build, EClassifierTypeLiteral.class, 23, 0, 23, 36, 0, 36, ((Call)ast).getArguments()
+				.get(1));
+		final EClassifierTypeLiteral typeLiteral = (EClassifierTypeLiteral)((Call)ast).getArguments().get(1);
+		assertEquals(EcorePackage.eINSTANCE.getEClass().getName(), typeLiteral.getEClassifierName());
 		assertEquals(0, build.getErrors().size());
 		assertEquals(Diagnostic.OK, build.getDiagnostic().getSeverity());
 		assertEquals(0, build.getDiagnostic().getChildren().size());
@@ -1095,9 +1090,10 @@
 		assertEquals("eInverse", ((Call)ast).getServiceName());
 		assertEquals(2, ((Call)ast).getArguments().size());
 		assertExpression(build, VarRef.class, 0, 0, 0, 4, 0, 4, ((Call)ast).getArguments().get(0));
-		assertExpression(build, TypeLiteral.class, 14, 0, 14, 27, 0, 27, ((Call)ast).getArguments().get(1));
-		final TypeLiteral typeLiteral = (TypeLiteral)((Call)ast).getArguments().get(1);
-		assertEquals(EcorePackage.eINSTANCE.getEClass(), typeLiteral.getValue());
+		assertExpression(build, EClassifierTypeLiteral.class, 14, 0, 14, 27, 0, 27, ((Call)ast).getArguments()
+				.get(1));
+		final EClassifierTypeLiteral typeLiteral = (EClassifierTypeLiteral)((Call)ast).getArguments().get(1);
+		assertEquals(EcorePackage.eINSTANCE.getEClass().getName(), typeLiteral.getEClassifierName());
 		assertEquals(0, build.getErrors().size());
 		assertEquals(Diagnostic.OK, build.getDiagnostic().getSeverity());
 		assertEquals(0, build.getDiagnostic().getChildren().size());
@@ -1793,10 +1789,10 @@
 		AstResult build = engine.build("toto::");
 		Expression ast = build.getAst();
 
-		assertExpression(build, ErrorTypeLiteral.class, 0, 0, 0, 6, 0, 6, ast);
-		assertFalse(((ErrorTypeLiteral)ast).isMissingColon());
-		assertEquals(1, ((ErrorTypeLiteral)ast).getSegments().size());
-		assertEquals("toto", ((ErrorTypeLiteral)ast).getSegments().get(0));
+		assertExpression(build, ErrorEClassifierTypeLiteral.class, 0, 0, 0, 6, 0, 6, ast);
+		assertFalse(((ErrorEClassifierTypeLiteral)ast).isMissingColon());
+		assertEquals("toto", ((ErrorEClassifierTypeLiteral)ast).getEPackageName());
+		assertEquals(null, ((ErrorEClassifierTypeLiteral)ast).getEClassifierName());
 		assertEquals(1, build.getErrors().size());
 		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getSeverity());
 		assertEquals(1, build.getDiagnostic().getChildren().size());
@@ -1813,9 +1809,9 @@
 
 		assertExpression(build, ErrorEnumLiteral.class, 0, 0, 0, 12, 0, 12, ast);
 		assertFalse(((ErrorEnumLiteral)ast).isMissingColon());
-		assertEquals(2, ((ErrorEnumLiteral)ast).getSegments().size());
-		assertEquals("toto", ((ErrorEnumLiteral)ast).getSegments().get(0));
-		assertEquals("tata", ((ErrorEnumLiteral)ast).getSegments().get(1));
+		assertEquals("toto", ((ErrorEnumLiteral)ast).getEPackageName());
+		assertEquals("tata", ((ErrorEnumLiteral)ast).getEEnumName());
+		assertEquals(null, ((ErrorEnumLiteral)ast).getEEnumLiteralName());
 		assertEquals(1, build.getErrors().size());
 		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getSeverity());
 		assertEquals(2, build.getDiagnostic().getChildren().size());
@@ -1940,10 +1936,6 @@
 		assertExpression(build, ErrorTypeLiteral.class, 17, 0, 17, 17, 0, 17,
 				((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1)).getParameters().get(0))
 						.getType());
-		assertFalse(((ErrorTypeLiteral)((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1))
-				.getParameters().get(0)).getType()).isMissingColon());
-		assertEquals(0, ((ErrorTypeLiteral)((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1))
-				.getParameters().get(0)).getType()).getSegments().size());
 		assertExpression(build, ErrorExpression.class, 17, 0, 17, 17, 0, 17, ((Lambda)((Call)ast)
 				.getArguments().get(1)).getExpression());
 		assertEquals(3, build.getErrors().size());
@@ -1974,15 +1966,15 @@
 		assertExpression(build, Lambda.class, 27, 0, 27, 27, 0, 27, ((Call)ast).getArguments().get(1));
 		assertEquals("a", ((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1)).getParameters()
 				.get(0)).getName());
-		assertExpression(build, ErrorTypeLiteral.class, 18, 0, 18, 25, 0, 25,
+		assertExpression(build, ErrorEClassifierTypeLiteral.class, 18, 0, 18, 25, 0, 25,
 				((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1)).getParameters().get(0))
 						.getType());
-		assertFalse(((ErrorTypeLiteral)((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1))
-				.getParameters().get(0)).getType()).isMissingColon());
-		assertEquals(1, ((ErrorTypeLiteral)((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1))
-				.getParameters().get(0)).getType()).getSegments().size());
-		assertEquals("ecore", ((ErrorTypeLiteral)((VariableDeclaration)((Lambda)((Call)ast).getArguments()
-				.get(1)).getParameters().get(0)).getType()).getSegments().get(0));
+		assertFalse(((ErrorEClassifierTypeLiteral)((VariableDeclaration)((Lambda)((Call)ast).getArguments()
+				.get(1)).getParameters().get(0)).getType()).isMissingColon());
+		assertEquals("ecore", ((ErrorEClassifierTypeLiteral)((VariableDeclaration)((Lambda)((Call)ast)
+				.getArguments().get(1)).getParameters().get(0)).getType()).getEPackageName());
+		assertEquals(null, ((ErrorEClassifierTypeLiteral)((VariableDeclaration)((Lambda)((Call)ast)
+				.getArguments().get(1)).getParameters().get(0)).getType()).getEClassifierName());
 		assertExpression(build, ErrorExpression.class, 27, 0, 27, 27, 0, 27, ((Lambda)((Call)ast)
 				.getArguments().get(1)).getExpression());
 		assertEquals(3, build.getErrors().size());
@@ -2012,11 +2004,12 @@
 		assertExpression(build, Lambda.class, 31, 0, 31, 31, 0, 31, ((Call)ast).getArguments().get(1));
 		assertEquals("a", ((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1)).getParameters()
 				.get(0)).getName());
-		assertExpression(build, TypeLiteral.class, 18, 0, 18, 31, 0, 31,
+		assertExpression(build, EClassifierTypeLiteral.class, 18, 0, 18, 31, 0, 31,
 				((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1)).getParameters().get(0))
 						.getType());
-		assertEquals(true, ((TypeLiteral)((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1))
-				.getParameters().get(0)).getType()).getValue() == EcorePackage.Literals.ECLASS);
+		assertEquals(EcorePackage.Literals.ECLASS.getName(),
+				((EClassifierTypeLiteral)((VariableDeclaration)((Lambda)((Call)ast).getArguments().get(1))
+						.getParameters().get(0)).getType()).getEClassifierName());
 		assertExpression(build, ErrorExpression.class, 31, 0, 31, 31, 0, 31, ((Lambda)((Call)ast)
 				.getArguments().get(1)).getExpression());
 		assertEquals(3, build.getErrors().size());
@@ -2158,8 +2151,6 @@
 				.getValue() == List.class);
 		assertExpression(build, ErrorTypeLiteral.class, 21, 0, 21, 21, 0, 21,
 				((CollectionTypeLiteral)((Call)ast).getArguments().get(1)).getElementType());
-		assertFalse(((ErrorTypeLiteral)((CollectionTypeLiteral)((Call)ast).getArguments().get(1))
-				.getElementType()).isMissingColon());
 		assertEquals(2, build.getErrors().size());
 		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getSeverity());
 		assertEquals(2, build.getDiagnostic().getChildren().size());
@@ -2188,8 +2179,8 @@
 				.getArguments().get(1)).getElementType());
 		assertEquals(true, ((CollectionTypeLiteral)((Call)ast).getArguments().get(1))
 				.getValue() == List.class);
-		assertEquals(true, ((CollectionTypeLiteral)((Call)ast).getArguments().get(1)).getElementType()
-				.getValue() == String.class);
+		assertEquals(true, ((ClassTypeLiteral)((CollectionTypeLiteral)((Call)ast).getArguments().get(1))
+				.getElementType()).getValue() == String.class);
 		assertEquals(1, build.getErrors().size());
 		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getSeverity());
 		assertEquals(2, build.getDiagnostic().getChildren().size());
@@ -2219,8 +2210,6 @@
 				.getValue() == Set.class);
 		assertExpression(build, ErrorTypeLiteral.class, 23, 0, 23, 23, 0, 23,
 				((CollectionTypeLiteral)((Call)ast).getArguments().get(1)).getElementType());
-		assertFalse(((ErrorTypeLiteral)((CollectionTypeLiteral)((Call)ast).getArguments().get(1))
-				.getElementType()).isMissingColon());
 		assertEquals(2, build.getErrors().size());
 		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getSeverity());
 		assertEquals(2, build.getDiagnostic().getChildren().size());
@@ -2249,7 +2238,7 @@
 				.getValue() == Set.class);
 		assertExpression(build, TypeLiteral.class, 23, 0, 23, 29, 0, 29, ((CollectionTypeLiteral)((Call)ast)
 				.getArguments().get(1)).getElementType());
-		assertEquals(true, ((TypeLiteral)((CollectionTypeLiteral)((Call)ast).getArguments().get(1))
+		assertEquals(true, ((ClassTypeLiteral)((CollectionTypeLiteral)((Call)ast).getArguments().get(1))
 				.getElementType()).getValue() == String.class);
 		assertEquals(1, build.getErrors().size());
 		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getSeverity());
@@ -2378,9 +2367,10 @@
 		assertExpression(build, Let.class, 0, 0, 0, 22, 0, 22, ast);
 		assertEquals(1, ((Let)ast).getBindings().size());
 		assertEquals("a", ((Let)ast).getBindings().get(0).getName());
-		assertExpression(build, ErrorTypeLiteral.class, 8, 0, 8, 15, 0, 15, ((Let)ast).getBindings().get(0)
-				.getType());
-		assertFalse(((ErrorTypeLiteral)((Let)ast).getBindings().get(0).getType()).isMissingColon());
+		assertExpression(build, ErrorEClassifierTypeLiteral.class, 8, 0, 8, 15, 0, 15, ((Let)ast)
+				.getBindings().get(0).getType());
+		assertFalse(((ErrorEClassifierTypeLiteral)((Let)ast).getBindings().get(0).getType())
+				.isMissingColon());
 		assertExpression(build, ErrorExpression.class, 18, 0, 18, 18, 0, 18, ((Let)ast).getBindings().get(0)
 				.getValue());
 		assertExpression(build, VarRef.class, 21, 0, 21, 22, 0, 22, ((Let)ast).getBody());
@@ -2416,7 +2406,7 @@
 		assertExpression(build, IntegerLiteral.class, 6, 0, 6, 7, 0, 7, ((Let)ast).getBindings().get(0)
 				.getValue());
 		assertEquals("b", ((Let)ast).getBindings().get(1).getName());
-		assertTrue(((Let)ast).getBindings().get(1).getType() instanceof ErrorTypeLiteral);
+		assertTrue(((Let)ast).getBindings().get(1).getType() instanceof ErrorEClassifierTypeLiteral);
 		assertExpression(build, ErrorExpression.class, 23, 0, 23, 23, 0, 23, ((Let)ast).getBindings().get(1)
 				.getValue());
 		assertExpression(build, Call.class, 26, 0, 26, 31, 0, 31, ((Let)ast).getBody());
@@ -2673,9 +2663,8 @@
 		assertEquals(2, ((TypeSetLiteral)ast).getTypes().size());
 		assertExpression(build, TypeLiteral.class, 1, 0, 1, 14, 0, 14, ((TypeSetLiteral)ast).getTypes().get(
 				0));
-		assertExpression(build, ErrorTypeLiteral.class, 16, 0, 16, 16, 0, 16, ((TypeSetLiteral)ast).getTypes()
-				.get(1));
-		assertFalse(((ErrorTypeLiteral)((TypeSetLiteral)ast).getTypes().get(1)).isMissingColon());
+		assertExpression(build, ErrorEClassifierTypeLiteral.class, 16, 0, 16, 16, 0, 16, ((TypeSetLiteral)ast)
+				.getTypes().get(1));
 		assertEquals(build.getErrors().get(0), ((TypeSetLiteral)ast).getTypes().get(1));
 	}
 
@@ -2700,8 +2689,9 @@
 		final ErrorCall call = (ErrorCall)lambda.getExpression();
 		assertEquals(2, call.getArguments().size());
 		assertExpression(build, VarRef.class, 33, 0, 33, 34, 0, 34, call.getArguments().get(0));
-		assertExpression(build, ErrorTypeLiteral.class, 47, 0, 47, 51, 0, 51, call.getArguments().get(1));
-		assertTrue(((ErrorTypeLiteral)call.getArguments().get(1)).isMissingColon());
+		assertExpression(build, ErrorEClassifierTypeLiteral.class, 47, 0, 47, 51, 0, 51, call.getArguments()
+				.get(1));
+		assertTrue(((ErrorEClassifierTypeLiteral)call.getArguments().get(1)).isMissingColon());
 
 		assertEquals(3, build.getErrors().size());
 		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getSeverity());
@@ -2739,8 +2729,10 @@
 		assertEquals(2, call.getArguments().size());
 		assertExpression(build, VarRef.class, 33, 0, 33, 34, 0, 34, call.getArguments().get(0));
 		assertExpression(build, ErrorEnumLiteral.class, 47, 0, 47, 61, 0, 61, call.getArguments().get(1));
-		assertEquals(2, ((ErrorEnumLiteral)call.getArguments().get(1)).getSegments().size());
 		assertTrue(((ErrorEnumLiteral)call.getArguments().get(1)).isMissingColon());
+		assertEquals("anydsl", ((ErrorEnumLiteral)call.getArguments().get(1)).getEPackageName());
+		assertEquals("Color", ((ErrorEnumLiteral)call.getArguments().get(1)).getEEnumName());
+		assertEquals(null, ((ErrorEnumLiteral)call.getArguments().get(1)).getEEnumLiteralName());
 
 		assertEquals(3, build.getErrors().size());
 		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getSeverity());
@@ -2769,8 +2761,8 @@
 		assertExpression(build, Lambda.class, 51, 0, 51, 51, 0, 51, ((Call)ast).getArguments().get(1));
 		final Lambda lambda = (Lambda)((Call)ast).getArguments().get(1);
 		assertExpression(build, ErrorExpression.class, 51, 0, 51, 51, 0, 51, lambda.getExpression());
-		assertExpression(build, ErrorTypeLiteral.class, 44, 0, 44, 51, 0, 51, lambda.getParameters().get(0)
-				.getType());
+		assertExpression(build, ErrorEClassifierTypeLiteral.class, 44, 0, 44, 51, 0, 51, lambda
+				.getParameters().get(0).getType());
 
 		assertEquals(3, build.getErrors().size());
 		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getSeverity());
@@ -2797,8 +2789,8 @@
 		assertExpression(build, Lambda.class, 55, 0, 55, 55, 0, 55, ((Call)ast).getArguments().get(1));
 		final Lambda lambda = (Lambda)((Call)ast).getArguments().get(1);
 		assertExpression(build, ErrorExpression.class, 55, 0, 55, 55, 0, 55, lambda.getExpression());
-		assertExpression(build, ErrorTypeLiteral.class, 44, 0, 44, 56, 0, 56, lambda.getParameters().get(0)
-				.getType());
+		assertExpression(build, ErrorEClassifierTypeLiteral.class, 44, 0, 44, 56, 0, 56, lambda
+				.getParameters().get(0).getType());
 
 		assertEquals(4, build.getErrors().size());
 		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getSeverity());
@@ -2827,9 +2819,12 @@
 		assertEquals("aPackage", ((VarRef)((Call)ast).getArguments().get(0)).getVariableName());
 		assertExpression(build, Lambda.class, 37, 0, 37, 66, 0, 66, ((Call)ast).getArguments().get(1));
 		final Lambda lambda = (Lambda)((Call)ast).getArguments().get(1);
-		assertExpression(build, ErrorTypeLiteral.class, 27, 0, 27, 36, 0, 36, lambda.getParameters().get(0)
-				.getType());
-		assertEquals(0, ((ErrorTypeLiteral)lambda.getParameters().get(0).getType()).getSegments().size());
+		assertExpression(build, ErrorEClassifierTypeLiteral.class, 27, 0, 27, 36, 0, 36, lambda
+				.getParameters().get(0).getType());
+		assertEquals(null, ((ErrorEClassifierTypeLiteral)lambda.getParameters().get(0).getType())
+				.getEPackageName());
+		assertEquals(null, ((ErrorEClassifierTypeLiteral)lambda.getParameters().get(0).getType())
+				.getEClassifierName());
 		assertEquals("", lambda.getParameters().get(0).getName());
 		assertExpression(build, Call.class, 37, 0, 37, 66, 0, 66, lambda.getExpression());
 		assertEquals("differs", ((Call)lambda.getExpression()).getServiceName());
@@ -2863,16 +2858,12 @@
 		assertEquals("not", ((Call)lambda.getExpression()).getServiceName());
 		assertEquals(1, ((Call)lambda.getExpression()).getArguments().size());
 
-		assertEquals(2, build.getErrors().size());
+		assertEquals(1, build.getErrors().size());
 		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getSeverity());
-		assertEquals(2, build.getDiagnostic().getChildren().size());
+		assertEquals(1, build.getDiagnostic().getChildren().size());
 		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getChildren().get(0).getSeverity());
-		assertEquals("invalid type literal uml::Slot", build.getDiagnostic().getChildren().get(0)
-				.getMessage());
+		assertEquals("invalid iteration call", build.getDiagnostic().getChildren().get(0).getMessage());
 		assertEquals(build.getErrors().get(0), build.getDiagnostic().getChildren().get(0).getData().get(0));
-		assertEquals(Diagnostic.ERROR, build.getDiagnostic().getChildren().get(1).getSeverity());
-		assertEquals("invalid iteration call", build.getDiagnostic().getChildren().get(1).getMessage());
-		assertEquals(build.getErrors().get(1), build.getDiagnostic().getChildren().get(1).getData().get(0));
 	}
 
 	@Test
diff --git a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/EvaluationTest.java b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/EvaluationTest.java
index 83e04e7..a4792af 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/EvaluationTest.java
+++ b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/EvaluationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -71,7 +71,7 @@
 		final Set<IService<?>> services = ServiceUtils.getServices(queryEnvironment, EObjectServices.class);
 		ServiceUtils.registerServices(queryEnvironment, services);
 		engine = new QueryEvaluationEngine(queryEnvironment);
-		builder = new QueryBuilderEngine(queryEnvironment);
+		builder = new QueryBuilderEngine();
 	}
 
 	@Test
diff --git a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/PositionsTests.java b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/PositionsTests.java
index 82ab012..281ee44 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/PositionsTests.java
+++ b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/PositionsTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Obeo.
+ * Copyright (c) 2020, 2021 Obeo.
  * 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
@@ -37,7 +37,7 @@
 		queryEnvironment = Query.newEnvironmentWithDefaultServices(null);
 		queryEnvironment.registerEPackage(EcorePackage.eINSTANCE);
 		queryEnvironment.registerEPackage(AnydslPackage.eINSTANCE);
-		engine = new QueryBuilderEngine(queryEnvironment);
+		engine = new QueryBuilderEngine();
 	}
 
 	@Test(expected = IllegalArgumentException.class)
diff --git a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/ValidationTest.java b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/ValidationTest.java
index 4505258..03c2e39 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/ValidationTest.java
+++ b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/ValidationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -1084,9 +1084,11 @@
 		IType possibleType = it.next();
 		assertTrue(possibleType instanceof EClassifierType);
 		assertEquals(EcorePackage.eINSTANCE.getEClass(), ((EClassifierType)possibleType).getType());
-		assertEquals(1, validationResult.getMessages().size());
+		assertEquals(2, validationResult.getMessages().size());
 		assertValidationMessage(validationResult.getMessages().get(0), ValidationMessageLevel.ERROR,
 				"invalid type literal invalid::Type", 13, 26);
+		assertValidationMessage(validationResult.getMessages().get(1), ValidationMessageLevel.WARNING,
+				"EClassifier=EClass is incompatible with declaration [].", 37, 43);
 	}
 
 	@Test
@@ -1380,9 +1382,11 @@
 		assertTrue(possibleType instanceof SetType);
 		assertEquals(EcorePackage.eINSTANCE.getEClass(), ((SetType)possibleType).getCollectionType()
 				.getType());
-		assertEquals(1, validationResult.getMessages().size());
+		assertEquals(2, validationResult.getMessages().size());
 		assertValidationMessage(validationResult.getMessages().get(0), ValidationMessageLevel.ERROR,
 				"invalid type literal invalid::Type", 22, 35);
+		assertValidationMessage(validationResult.getMessages().get(1), ValidationMessageLevel.WARNING,
+				"EClassifier=EClass is incompatible with declaration [].", 38, 44);
 	}
 
 	@Test
diff --git a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/services/tests/CollectionServicesTest.java b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/services/tests/CollectionServicesTest.java
index 044ea94..c521b77 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/services/tests/CollectionServicesTest.java
+++ b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/services/tests/CollectionServicesTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -2827,7 +2827,7 @@
 		IQueryEnvironment queryEnvironment = Query.newEnvironmentWithDefaultServices(null);
 		queryEnvironment.registerEPackage(EcorePackage.eINSTANCE);
 
-		IQueryBuilderEngine queryBuilder = new QueryBuilderEngine(queryEnvironment);
+		IQueryBuilderEngine queryBuilder = new QueryBuilderEngine();
 		AstResult query = queryBuilder.build("self.eContents()->filter(ecore::EClass)");
 
 		IQueryEvaluationEngine evaluationEngine = new QueryEvaluationEngine(queryEnvironment);
@@ -2855,7 +2855,7 @@
 		queryEnvironment.registerEPackage(EcorePackage.eINSTANCE);
 		queryEnvironment.registerEPackage(AnydslPackage.eINSTANCE);
 
-		IQueryBuilderEngine queryBuilder = new QueryBuilderEngine(queryEnvironment);
+		IQueryBuilderEngine queryBuilder = new QueryBuilderEngine();
 		AstResult query = queryBuilder.build("self.eContents()->filter(anydsl::Company)");
 
 		IQueryEvaluationEngine evaluationEngine = new QueryEvaluationEngine(queryEnvironment);
diff --git a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/services/tests/EObjectServicesPerformanceTest.java b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/services/tests/EObjectServicesPerformanceTest.java
index 51a9e56..3bb8e3d 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/services/tests/EObjectServicesPerformanceTest.java
+++ b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/services/tests/EObjectServicesPerformanceTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016 Obeo.
+ * Copyright (c) 2016, 2021 Obeo.
  * 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
@@ -116,7 +116,7 @@
 	 * @return
 	 */
 	private EvaluationResult eval(EObject root, String expr) {
-		IQueryBuilderEngine queryBuilder = new QueryBuilderEngine(queryEnvironment);
+		IQueryBuilderEngine queryBuilder = new QueryBuilderEngine();
 		AstResult query = queryBuilder.build(expr);
 		IQueryEvaluationEngine evaluationEngine = new QueryEvaluationEngine(queryEnvironment);
 		Map<String, Object> variables = new HashMap<String, Object>();
diff --git a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/tests/AcceleoQueryInterpreter.java b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/tests/AcceleoQueryInterpreter.java
index 88b7fc4..e88e3a1 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/tests/AcceleoQueryInterpreter.java
+++ b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/tests/AcceleoQueryInterpreter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2015, 2021 Obeo.
  * 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
@@ -133,7 +133,7 @@
 
 	@Override
 	public void compileQuery(Query query) {
-		IQueryBuilderEngine builder = new QueryBuilderEngine(queryEnvironment);
+		IQueryBuilderEngine builder = new QueryBuilderEngine();
 		// TODO test build.getErrors()
 		AstResult build = builder.build(expressionToEvaluate);
 		astResult = build;
diff --git a/tests/org.eclipse.acceleo.aql.migration.tests/src/org/eclipse/acceleo/aql/migration/tests/utils/AbstractMigrationTestSuite.java b/tests/org.eclipse.acceleo.aql.migration.tests/src/org/eclipse/acceleo/aql/migration/tests/utils/AbstractMigrationTestSuite.java
index 78486f8..d7069c1 100644
--- a/tests/org.eclipse.acceleo.aql.migration.tests/src/org/eclipse/acceleo/aql/migration/tests/utils/AbstractMigrationTestSuite.java
+++ b/tests/org.eclipse.acceleo.aql.migration.tests/src/org/eclipse/acceleo/aql/migration/tests/utils/AbstractMigrationTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2016, 2020 Obeo. 
+ *  Copyright (c) 2016, 2021 Obeo. 
  *  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
@@ -28,11 +28,6 @@
 import org.eclipse.acceleo.aql.migration.IModuleResolver;
 import org.eclipse.acceleo.aql.migration.ModuleMigrator;
 import org.eclipse.acceleo.aql.parser.AcceleoAstSerializer;
-import org.eclipse.acceleo.aql.parser.AcceleoParser;
-import org.eclipse.acceleo.query.runtime.impl.namespace.ClassLoaderQualifiedNameResolver;
-import org.eclipse.acceleo.query.runtime.impl.namespace.QualifiedNameQueryEnvironment;
-import org.eclipse.acceleo.query.runtime.namespace.IQualifiedNameQueryEnvironment;
-import org.eclipse.acceleo.query.runtime.namespace.IQualifiedNameResolver;
 import org.eclipse.acceleo.tests.utils.AbstractLanguageTestSuite;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.junit.Test;
@@ -127,14 +122,6 @@
 		}
 	}
 
-	protected AcceleoParser createParser() {
-		final IQualifiedNameResolver resolver = new ClassLoaderQualifiedNameResolver(getClass()
-				.getClassLoader(), AcceleoParser.QUALIFIER_SEPARATOR);
-		final IQualifiedNameQueryEnvironment queryEnvironment = new QualifiedNameQueryEnvironment(resolver);
-		AcceleoParser parser = new AcceleoParser(queryEnvironment);
-		return parser;
-	}
-
 	/**
 	 * Gets the file from the test folder.
 	 * 
diff --git a/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/completion/CompletionTests.java b/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/completion/CompletionTests.java
index c9e01f1..a32016c 100644
--- a/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/completion/CompletionTests.java
+++ b/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/completion/CompletionTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2020 Obeo.
+ * Copyright (c) 2017, 2021 Obeo.
  * 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
@@ -128,10 +128,10 @@
 
 		final AcceleoEvaluator evaluator = new AcceleoEvaluator(acceleoEnvironment, queryEnvironment
 				.getLookupEngine());
-		resolver.addLoader(new ModuleLoader(new AcceleoParser(queryEnvironment), evaluator));
+		final AcceleoParser parser = new AcceleoParser();
+		resolver.addLoader(new ModuleLoader(parser, evaluator));
 		resolver.addLoader(new JavaLoader(AcceleoParser.QUALIFIER_SEPARATOR));
 
-		final AcceleoParser parser = new AcceleoParser(acceleoEnvironment.getQueryEnvironment());
 		final AcceleoAstResult parsingResult = parser.parse(source, "org::eclipse::acceleo::tests::");
 		final Module module = parsingResult.getModule();
 		resolver.register("org::eclipse::acceleo::tests::" + module.getName(), module);
diff --git a/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/parser/AcceleoAstSerializerTests.java b/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/parser/AcceleoAstSerializerTests.java
index 7289629..21bde6e 100644
--- a/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/parser/AcceleoAstSerializerTests.java
+++ b/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/parser/AcceleoAstSerializerTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Obeo.
+ * Copyright (c) 2020, 2021 Obeo.
  * 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
@@ -28,8 +28,6 @@
 import org.eclipse.acceleo.aql.parser.AcceleoAstResult;
 import org.eclipse.acceleo.aql.parser.AcceleoAstSerializer;
 import org.eclipse.acceleo.aql.parser.AcceleoParser;
-import org.eclipse.acceleo.query.runtime.IReadOnlyQueryEnvironment;
-import org.eclipse.acceleo.query.runtime.Query;
 import org.eclipse.acceleo.tests.utils.AbstractLanguageTestSuite;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -76,9 +74,7 @@
 	 */
 	public AcceleoAstSerializerTests(String modulePath) throws FileNotFoundException, IOException {
 		this.modulePath = modulePath;
-		final IReadOnlyQueryEnvironment queryEnvironment = Query.newEnvironmentWithDefaultServices(null,
-				null);
-		AcceleoParser parser = new AcceleoParser(queryEnvironment);
+		AcceleoParser parser = new AcceleoParser();
 		try (InputStream stream = new FileInputStream(ROOT + File.separator + modulePath)) {
 			source = AbstractLanguageTestSuite.getContent(stream, AbstractLanguageTestSuite.UTF_8);
 			ast = parser.parse(source, "org::eclipse::acceleo::tests::test");
diff --git a/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/utils/AbstractLanguageTestSuite.java b/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/utils/AbstractLanguageTestSuite.java
index 126068a..d992fd3 100644
--- a/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/utils/AbstractLanguageTestSuite.java
+++ b/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/utils/AbstractLanguageTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2016, 2020 Obeo. 
+ *  Copyright (c) 2016, 2021 Obeo. 
  *  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
@@ -148,7 +148,7 @@
 				memoryDestination);
 
 		evaluator = new AcceleoEvaluator(this.environment, queryEnvironment.getLookupEngine());
-		resolver.addLoader(new ModuleLoader(new AcceleoParser(queryEnvironment), evaluator));
+		resolver.addLoader(new ModuleLoader(new AcceleoParser(), evaluator));
 		resolver.addLoader(new JavaLoader(AcceleoParser.QUALIFIER_SEPARATOR));
 
 		String namespace = rootPath.relativize(testFolderFile.toPath()).toString().replace(File.separator,
diff --git a/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/utils/ModuleAstSerializer.java b/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/utils/ModuleAstSerializer.java
index 35d2fe8..0afabf4 100644
--- a/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/utils/ModuleAstSerializer.java
+++ b/tests/org.eclipse.acceleo.aql.tests/src/org/eclipse/acceleo/tests/utils/ModuleAstSerializer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2016 Obeo. 
+ *  Copyright (c) 2016, 2021 Obeo. 
  *  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
@@ -58,8 +58,10 @@
 import org.eclipse.acceleo.query.ast.BooleanLiteral;
 import org.eclipse.acceleo.query.ast.Call;
 import org.eclipse.acceleo.query.ast.CallType;
+import org.eclipse.acceleo.query.ast.ClassTypeLiteral;
 import org.eclipse.acceleo.query.ast.CollectionTypeLiteral;
 import org.eclipse.acceleo.query.ast.Conditional;
+import org.eclipse.acceleo.query.ast.EClassifierTypeLiteral;
 import org.eclipse.acceleo.query.ast.EnumLiteral;
 import org.eclipse.acceleo.query.ast.Error;
 import org.eclipse.acceleo.query.ast.Expression;
@@ -77,7 +79,6 @@
 import org.eclipse.acceleo.query.ast.VariableDeclaration;
 import org.eclipse.acceleo.query.ast.util.AstSwitch;
 import org.eclipse.acceleo.util.AcceleoSwitch;
-import org.eclipse.emf.ecore.EClassifier;
 
 /**
  * Serialize a {@link Template}.
@@ -214,11 +215,11 @@
 
 		@Override
 		public Void caseEnumLiteral(EnumLiteral enumLiteral) {
-			builder.append(enumLiteral.getLiteral().getEEnum().getEPackage().getName());
+			builder.append(enumLiteral.getEPackageName());
 			builder.append("::");
-			builder.append(enumLiteral.getLiteral().getEEnum().getName());
+			builder.append(enumLiteral.getEEnumName());
 			builder.append("::");
-			builder.append(enumLiteral.getLiteral().getName());
+			builder.append(enumLiteral.getEEnumLiteralName());
 			return null;
 		}
 
@@ -323,12 +324,14 @@
 		}
 
 		@Override
-		public Void caseTypeLiteral(TypeLiteral object) {
-			if (object.getValue() instanceof Class) {
-				builder.append(((Class<?>)object.getValue()).getName());
-			} else if (object.getValue() instanceof EClassifier) {
-				builder.append(((EClassifier)object.getValue()).getName());
-			}
+		public Void caseClassTypeLiteral(ClassTypeLiteral object) {
+			builder.append(object.getValue().getName());
+			return null;
+		}
+
+		@Override
+		public Void caseEClassifierTypeLiteral(EClassifierTypeLiteral object) {
+			builder.append(object.getEClassifierName());
 			return null;
 		}