diff --git a/msi.gama.core/src/msi/gaml/descriptions/SymbolDescription.java b/msi.gama.core/src/msi/gaml/descriptions/SymbolDescription.java
index 0b1ede2e51..ed51b7e8e0 100644
--- a/msi.gama.core/src/msi/gaml/descriptions/SymbolDescription.java
+++ b/msi.gama.core/src/msi/gaml/descriptions/SymbolDescription.java
@@ -1,7 +1,7 @@
 /*******************************************************************************************************
  *
  * SymbolDescription.java, in msi.gama.core, is part of the source code of the GAMA modeling and simulation platform
- * (v.2.0.0).
+ * (v.1.8.2).
  *
  * (c) 2007-2021 UMI 209 UMMISCO IRD/SU & Partners (IRIT, MIAT, TLU, CTU)
  *
@@ -98,7 +98,10 @@ public SymbolDescription(final String keyword, final IDescription superDesc, fin
 		this.keyword = keyword;
 		this.facets = facets;
 		element = source;
-		if (superDesc != null) { originName = superDesc.getName(); }
+		if (facets != null && facets.containsKey(ORIGIN)) {
+			originName = facets.getLabel(ORIGIN);
+			facets.remove(ORIGIN);
+		} else if (superDesc != null) { originName = superDesc.getName(); }
 		setEnclosingDescription(superDesc);
 		proto = DescriptionFactory.getProto(getKeyword(), getSpeciesContext());
 	}
diff --git a/msi.gama.core/src/msi/gaml/descriptions/TypeDescription.java b/msi.gama.core/src/msi/gaml/descriptions/TypeDescription.java
index 43eabc6f27..4d33956570 100644
--- a/msi.gama.core/src/msi/gaml/descriptions/TypeDescription.java
+++ b/msi.gama.core/src/msi/gaml/descriptions/TypeDescription.java
@@ -1,9 +1,9 @@
 /*******************************************************************************************************
  *
- * msi.gaml.descriptions.TypeDescription.java, in plugin msi.gama.core, is part of the source code of the GAMA modeling
- * and simulation platform (v. 1.8.1)
+ * TypeDescription.java, in msi.gama.core, is part of the source code of the GAMA modeling and simulation platform
+ * (v.1.8.2).
  *
- * (c) 2007-2020 UMI 209 UMMISCO IRD/SU & Partners
+ * (c) 2007-2021 UMI 209 UMMISCO IRD/SU & Partners (IRIT, MIAT, TLU, CTU)
  *
  * Visit https://github.com/gama-platform/gama for license information and contacts.
  *
@@ -50,12 +50,39 @@ public abstract class TypeDescription extends SymbolDescription {
 	}
 
 	// AD 08/16 : actions and attributes are now inherited dynamically and built
+	/** The actions. */
 	// lazily
 	protected IMap<String, ActionDescription> actions;
+
+	/** The attributes. */
 	protected IMap<String, VariableDescription> attributes;
+
+	/** The parent. */
 	protected TypeDescription parent;
+
+	/** The is abstract. */
 	protected final boolean isAbstract;
 
+	/**
+	 * Instantiates a new type description.
+	 *
+	 * @param keyword
+	 *            the keyword
+	 * @param clazz
+	 *            the clazz
+	 * @param macroDesc
+	 *            the macro desc
+	 * @param parent
+	 *            the parent
+	 * @param cp
+	 *            the cp
+	 * @param source
+	 *            the source
+	 * @param facets
+	 *            the facets
+	 * @param plugin
+	 *            the plugin
+	 */
 	public TypeDescription(final String keyword, final Class clazz, final IDescription macroDesc,
 			final TypeDescription parent, final Iterable<? extends IDescription> cp, final EObject source,
 			final Facets facets, final String plugin) {
@@ -72,6 +99,11 @@ public TypeDescription(final String keyword, final Class clazz, final IDescripti
 
 	}
 
+	/**
+	 * Gets the attribute documentation.
+	 *
+	 * @return the attribute documentation
+	 */
 	public String getAttributeDocumentation() {
 		final StringBuilder sb = new StringBuilder(200);
 		sb.append("<b><br/>Attributes :</b><ul>");
@@ -84,6 +116,11 @@ public String getAttributeDocumentation() {
 		return sb.toString();
 	}
 
+	/**
+	 * Gets the action documentation.
+	 *
+	 * @return the action documentation
+	 */
 	public String getActionDocumentation() {
 		final StringBuilder sb = new StringBuilder(200);
 		sb.append("<b><br/>Actions :</b><ul>");
@@ -102,6 +139,11 @@ public String getDefiningPlugin() {
 		return null;
 	}
 
+	/**
+	 * Gets the java base.
+	 *
+	 * @return the java base
+	 */
 	public abstract Class getJavaBase();
 
 	/**
@@ -112,10 +154,20 @@ public Iterable<VariableDescription> getAttributes() {
 		return Iterables.transform(getAttributeNames(), this::getAttribute);
 	}
 
+	/**
+	 * Gets the own attributes.
+	 *
+	 * @return the own attributes
+	 */
 	public Iterable<VariableDescription> getOwnAttributes() {
 		return attributes == null ? Collections.EMPTY_LIST : attributes.values();
 	}
 
+	/**
+	 * Gets the attribute names.
+	 *
+	 * @return the attribute names
+	 */
 	public Collection<String> getAttributeNames() {
 		final Collection<String> accumulator =
 				parent != null && parent != this ? parent.getAttributeNames() : new LinkedHashSet<>();
@@ -129,12 +181,26 @@ public Collection<String> getAttributeNames() {
 		return accumulator;
 	}
 
+	/**
+	 * Gets the attribute.
+	 *
+	 * @param vn
+	 *            the vn
+	 * @return the attribute
+	 */
 	public VariableDescription getAttribute(final String vn) {
 		final VariableDescription attribute = attributes == null ? null : attributes.get(vn);
 		if (attribute == null && parent != null && parent != this) return getParent().getAttribute(vn);
 		return attribute;
 	}
 
+	/**
+	 * Redefines attribute.
+	 *
+	 * @param vn
+	 *            the vn
+	 * @return true, if successful
+	 */
 	public boolean redefinesAttribute(final String vn) {
 		if (!attributes.containsKey(name) || parent == null || parent == this) return false;
 		return parent.hasAttribute(name);
@@ -157,6 +223,12 @@ public IExpression getVarExpr(final String n, final boolean asField) {
 		return vd.getVarExpr(asField);
 	}
 
+	/**
+	 * Adds the attribute no check.
+	 *
+	 * @param vd
+	 *            the vd
+	 */
 	protected void addAttributeNoCheck(final VariableDescription vd) {
 		if (attributes == null) { attributes = GamaMapFactory.create(); }
 		// synchronized (this) {
@@ -164,6 +236,15 @@ protected void addAttributeNoCheck(final VariableDescription vd) {
 		// }
 	}
 
+	/**
+	 * Assert attributes are compatible.
+	 *
+	 * @param existingVar
+	 *            the existing var
+	 * @param newVar
+	 *            the new var
+	 * @return true, if successful
+	 */
 	public boolean assertAttributesAreCompatible(final VariableDescription existingVar,
 			final VariableDescription newVar) {
 		if (newVar.isBuiltIn() && existingVar.isBuiltIn()) return true;
@@ -177,6 +258,20 @@ public boolean assertAttributesAreCompatible(final VariableDescription existingV
 		return true;
 	}
 
+	/**
+	 * Mark type difference.
+	 *
+	 * @param existingVar
+	 *            the existing var
+	 * @param newVar
+	 *            the new var
+	 * @param existingType
+	 *            the existing type
+	 * @param newType
+	 *            the new type
+	 * @param error
+	 *            the error
+	 */
 	private void markTypeDifference(final VariableDescription existingVar, final VariableDescription newVar,
 			final IType existingType, final IType newType, final boolean error) {
 		final String msg = "Type (" + newType + ") differs from that (" + existingType + ") of the implementation of  "
@@ -212,6 +307,14 @@ private void markTypeDifference(final VariableDescription existingVar, final Var
 
 	}
 
+	/**
+	 * Mark attribute redefinition.
+	 *
+	 * @param existingVar
+	 *            the existing var
+	 * @param newVar
+	 *            the new var
+	 */
 	public void markAttributeRedefinition(final VariableDescription existingVar, final VariableDescription newVar) {
 		if (newVar.isBuiltIn() && existingVar.isBuiltIn()) return;
 		if (newVar.getOriginName().equals(existingVar.getOriginName())) {
@@ -244,12 +347,22 @@ public void markAttributeRedefinition(final VariableDescription existingVar, fin
 		}
 	}
 
+	/**
+	 * Inherit attributes from.
+	 *
+	 * @param p
+	 *            the p
+	 */
 	protected void inheritAttributesFrom(final TypeDescription p) {
-		for (final VariableDescription v : p.getAttributes()) {
-			addInheritedAttribute(v);
-		}
+		for (final VariableDescription v : p.getAttributes()) { addInheritedAttribute(v); }
 	}
 
+	/**
+	 * Adds the own attribute.
+	 *
+	 * @param vd
+	 *            the vd
+	 */
 	public void addOwnAttribute(final VariableDescription vd) {
 		final String newVarName = vd.getName();
 		final VariableDescription existing = getAttribute(newVarName);
@@ -265,6 +378,12 @@ public void addOwnAttribute(final VariableDescription vd) {
 		addAttributeNoCheck(vd);
 	}
 
+	/**
+	 * Adds the inherited attribute.
+	 *
+	 * @param vd
+	 *            the vd
+	 */
 	public void addInheritedAttribute(final VariableDescription vd) {
 		// We dont inherit from previously added variables, as a child and its
 		// parent should share the same javaBase
@@ -343,10 +462,22 @@ protected boolean verifyAttributeCycles() {
 		return true;
 	}
 
-	public void setParent(final TypeDescription parent) {
-		this.parent = parent;
-	}
+	/**
+	 * Sets the parent.
+	 *
+	 * @param parent
+	 *            the new parent
+	 */
+	public void setParent(final TypeDescription parent) { this.parent = parent; }
 
+	/**
+	 * Duplicate info.
+	 *
+	 * @param one
+	 *            the one
+	 * @param two
+	 *            the two
+	 */
 	protected void duplicateInfo(final IDescription one, final IDescription two) {
 		final String aName = one.getName();
 		final String key = one.getKeyword();
@@ -366,17 +497,34 @@ protected void duplicateInfo(final IDescription one, final IDescription two) {
 		}
 	}
 
+	/**
+	 * Adds the action.
+	 *
+	 * @param newAction
+	 *            the new action
+	 */
 	protected void addAction(final ActionDescription newAction) {
 		final String actionName = newAction.getName();
 		if (actions != null) {
-			final StatementDescription existing = actions.get(actionName);
-			if (existing != null) { duplicateInfo(newAction, existing); }
+			final ActionDescription existing = actions.get(actionName);
+			if (existing != null) {
+				assertActionsAreCompatible(newAction, existing, existing.getOriginName());
+
+				duplicateInfo(newAction, existing);
+			}
 		} else {
 			actions = GamaMapFactory.createUnordered();
 		}
 		actions.put(actionName, newAction);
 	}
 
+	/**
+	 * Redefines action.
+	 *
+	 * @param theName
+	 *            the the name
+	 * @return true, if successful
+	 */
 	public boolean redefinesAction(final String theName) {
 		if (!actions.containsKey(theName) || parent == null || parent == this) return false;
 		return parent.hasAction(theName, false);
@@ -390,16 +538,32 @@ public ActionDescription getAction(final String aName) {
 		return ownAction;
 	}
 
+	/**
+	 * Gets the own actions.
+	 *
+	 * @return the own actions
+	 */
 	public Iterable<ActionDescription> getOwnActions() {
 		return actions == null ? Collections.EMPTY_LIST : actions.values();
 	}
 
+	/**
+	 * Removes the action.
+	 *
+	 * @param temp
+	 *            the temp
+	 */
 	public void removeAction(final String temp) {
 		if (actions == null) return;
 		actions.remove(temp);
 
 	}
 
+	/**
+	 * Gets the action names.
+	 *
+	 * @return the action names
+	 */
 	public Collection<String> getActionNames() {
 		final Collection<String> allNames =
 				new LinkedHashSet(actions == null ? Collections.EMPTY_LIST : actions.keySet());
@@ -407,6 +571,11 @@ public Collection<String> getActionNames() {
 		return allNames;
 	}
 
+	/**
+	 * Gets the actions.
+	 *
+	 * @return the actions
+	 */
 	public Iterable<ActionDescription> getActions() {
 		return Iterables.transform(getActionNames(), this::getAction);
 	}
@@ -430,11 +599,14 @@ public IDescription getDescriptionDeclaringAction(final String vn, final boolean
 		return hasAction(vn, false) ? this : null;
 	}
 
+	/**
+	 * Checks if is abstract.
+	 *
+	 * @return true, if is abstract
+	 */
 	public final boolean isAbstract() {
 		if (isAbstract) return true;
-		for (final ActionDescription a : getActions()) {
-			if (a.isAbstract()) return true;
-		}
+		for (final ActionDescription a : getActions()) { if (a.isAbstract()) return true; }
 		return false;
 	}
 
@@ -443,6 +615,15 @@ protected IType computeType() {
 		return getTypeNamed(getName());
 	}
 
+	/**
+	 * Checks if is arg of.
+	 *
+	 * @param op
+	 *            the op
+	 * @param arg
+	 *            the arg
+	 * @return true, if is arg of
+	 */
 	public boolean isArgOf(final String op, final String arg) {
 		final ActionDescription action = getAction(op);
 		if (action != null) return action.containsArg(arg);
@@ -454,9 +635,7 @@ public boolean isArgOf(final String op, final String arg) {
 	 *
 	 * @return a TypeDescription or null
 	 */
-	public TypeDescription getParent() {
-		return parent;
-	}
+	public TypeDescription getParent() { return parent; }
 
 	@Override
 	public void dispose() {
@@ -468,6 +647,9 @@ public void dispose() {
 		parent = null;
 	}
 
+	/**
+	 * Inherit from parent.
+	 */
 	protected void inheritFromParent() {
 		// Takes care of invalid species (see Issue 711)
 		if (parent != null && parent != this) {
@@ -476,6 +658,12 @@ protected void inheritFromParent() {
 		}
 	}
 
+	/**
+	 * Inherit actions from.
+	 *
+	 * @param p
+	 *            the p
+	 */
 	protected void inheritActionsFrom(final TypeDescription p) {
 		if (p == null || p == this) return;
 		for (final ActionDescription inheritedAction : p.getActions()) {
@@ -514,8 +702,21 @@ protected void inheritActionsFrom(final TypeDescription p) {
 
 	}
 
+	/**
+	 * Assert actions are compatible.
+	 *
+	 * @param myAction
+	 *            the my action
+	 * @param parentAction
+	 *            the parent action
+	 * @param parentName
+	 *            the parent name
+	 */
 	public static void assertActionsAreCompatible(final ActionDescription myAction,
 			final ActionDescription parentAction, final String parentName) {
+		// We do no try to point the problems that may exist between two primitives
+		// like "send" in messaging and FIPA skills, or the type of heading in moving and moving3D skills...
+		if (myAction.isBuiltIn() && parentAction.isBuiltIn()) return;
 		final String actionName = parentAction.getName();
 		final IType myType = myAction.getGamlType();
 		final IType parentType = parentAction.getGamlType();
@@ -575,12 +776,8 @@ public static void assertActionsAreCompatible(final ActionDescription myAction,
 
 	@Override
 	public boolean visitChildren(final DescriptionVisitor<IDescription> visitor) {
-		for (final IDescription d : getAttributes()) {
-			if (!visitor.process(d)) return false;
-		}
-		for (final IDescription d : getActions()) {
-			if (!visitor.process(d)) return false;
-		}
+		for (final IDescription d : getAttributes()) { if (!visitor.process(d)) return false; }
+		for (final IDescription d : getActions()) { if (!visitor.process(d)) return false; }
 		return true;
 	}
 
@@ -596,21 +793,49 @@ public boolean visitOwnChildrenRecursively(final DescriptionVisitor<IDescription
 		return visitOwnActionsRecursively(visitor);
 	}
 
+	/**
+	 * Visit all attributes.
+	 *
+	 * @param visitor
+	 *            the visitor
+	 * @return true, if successful
+	 */
 	public boolean visitAllAttributes(final DescriptionVisitor<IDescription> visitor) {
 		if (parent != null && parent != this && !parent.visitAllAttributes(visitor)) return false;
 		return visitOwnAttributes(visitor);
 	}
 
+	/**
+	 * Visit own attributes.
+	 *
+	 * @param visitor
+	 *            the visitor
+	 * @return true, if successful
+	 */
 	public boolean visitOwnAttributes(final DescriptionVisitor<IDescription> visitor) {
 		if (attributes == null) return true;
 		return attributes.forEachValue(visitor);
 	}
 
+	/**
+	 * Visit own actions.
+	 *
+	 * @param visitor
+	 *            the visitor
+	 * @return true, if successful
+	 */
 	public boolean visitOwnActions(final DescriptionVisitor<IDescription> visitor) {
 		if (actions == null) return true;
 		return actions.forEachValue(visitor);
 	}
 
+	/**
+	 * Visit own actions recursively.
+	 *
+	 * @param visitor
+	 *            the visitor
+	 * @return true, if successful
+	 */
 	public boolean visitOwnActionsRecursively(final DescriptionVisitor<IDescription> visitor) {
 		if (actions == null) return true;
 		return actions.forEachValue(each -> {
@@ -633,10 +858,24 @@ public IDescription validate() {
 		return result;
 	}
 
+	/**
+	 * Gets the own attribute.
+	 *
+	 * @param kw
+	 *            the kw
+	 * @return the own attribute
+	 */
 	public VariableDescription getOwnAttribute(final String kw) {
 		return attributes == null ? null : attributes.get(kw);
 	}
 
+	/**
+	 * Gets the own action.
+	 *
+	 * @param kw
+	 *            the kw
+	 * @return the own action
+	 */
 	public ActionDescription getOwnAction(final String kw) {
 		return actions == null ? null : actions.get(kw);
 	}
diff --git a/msi.gama.core/src/msi/gaml/factories/ModelAssembler.java b/msi.gama.core/src/msi/gaml/factories/ModelAssembler.java
index 20c42f93f6..34008c53b1 100644
--- a/msi.gama.core/src/msi/gaml/factories/ModelAssembler.java
+++ b/msi.gama.core/src/msi/gaml/factories/ModelAssembler.java
@@ -1,12 +1,12 @@
 /*******************************************************************************************************
  *
- * msi.gaml.factories.ModelAssembler.java, in plugin msi.gama.core, is part of the source code of the GAMA modeling and
- * simulation platform (v. 1.8.1)
+ * ModelAssembler.java, in msi.gama.core, is part of the source code of the
+ * GAMA modeling and simulation platform (v.1.8.2).
  *
- * (c) 2007-2020 UMI 209 UMMISCO IRD/SU & Partners
+ * (c) 2007-2021 UMI 209 UMMISCO IRD/SU & Partners (IRIT, MIAT, TLU, CTU)
  *
  * Visit https://github.com/gama-platform/gama for license information and contacts.
- *
+ * 
  ********************************************************************************************************/
 package msi.gaml.factories;
 
@@ -42,6 +42,7 @@
 import msi.gaml.compilation.ast.ISyntacticElement.SyntacticVisitor;
 import msi.gaml.compilation.ast.SyntacticFactory;
 import msi.gaml.compilation.ast.SyntacticModelElement;
+import msi.gaml.descriptions.ConstantExpressionDescription;
 import msi.gaml.descriptions.ExperimentDescription;
 import msi.gaml.descriptions.IDescription;
 import msi.gaml.descriptions.IDescription.DescriptionVisitor;
@@ -63,6 +64,17 @@
 @SuppressWarnings ({ "unchecked", "rawtypes" })
 public class ModelAssembler {
 
+	/**
+	 * Assemble.
+	 *
+	 * @param projectPath the project path
+	 * @param modelPath the model path
+	 * @param allModels the all models
+	 * @param collector the collector
+	 * @param document the document
+	 * @param mm the mm
+	 * @return the model description
+	 */
 	public ModelDescription assemble(final String projectPath, final String modelPath,
 			final Iterable<ISyntacticElement> allModels, final ValidationContext collector, final boolean document,
 			final Map<String, ModelDescription> mm) {
@@ -95,7 +107,10 @@ public ModelDescription assemble(final String projectPath, final String modelPat
 						globalFacets.putAll(currentModel.copyFacets(null));
 					}
 				}
-				currentModel.visitChildren(element -> globalNodes.addChild(element));
+				currentModel.visitChildren(element -> {
+					element.setFacet(IKeyword.ORIGIN, ConstantExpressionDescription.create(currentModel.getName()));
+					globalNodes.addChild(element);
+				});
 				SyntacticVisitor visitor = element -> addSpeciesNode(element, speciesNodes, collector);
 				currentModel.visitSpecies(visitor);
 
@@ -230,6 +245,12 @@ public ModelDescription assemble(final String projectPath, final String modelPat
 
 	}
 
+	/**
+	 * Gets the species in hierarchical order.
+	 *
+	 * @param model the model
+	 * @return the species in hierarchical order
+	 */
 	private Iterable<SpeciesDescription> getSpeciesInHierarchicalOrder(final ModelDescription model) {
 		final DirectedAcyclicGraph<SpeciesDescription, Object> hierarchy = new DirectedAcyclicGraph<>(Object.class);
 		final DescriptionVisitor<SpeciesDescription> visitor = desc -> {
@@ -253,6 +274,11 @@ private Iterable<SpeciesDescription> getSpeciesInHierarchicalOrder(final ModelDe
 		return () -> hierarchy.iterator();
 	}
 
+	/**
+	 * Creates the scheduler species.
+	 *
+	 * @param model the model
+	 */
 	private void createSchedulerSpecies(final ModelDescription model) {
 		final SpeciesDescription sd =
 				(SpeciesDescription) DescriptionFactory.create(SPECIES, model, NAME, "_internal_global_scheduler");
@@ -275,6 +301,14 @@ private void createSchedulerSpecies(final ModelDescription model) {
 		model.addChild(sd);
 	}
 
+	/**
+	 * Adds the experiment.
+	 *
+	 * @param origin the origin
+	 * @param model the model
+	 * @param experiment the experiment
+	 * @param cache the cache
+	 */
 	void addExperiment(final String origin, final ModelDescription model, final ISyntacticElement experiment,
 			final Map<String, SpeciesDescription> cache) {
 		// Create the experiment description
@@ -286,6 +320,14 @@ void addExperiment(final String origin, final ModelDescription model, final ISyn
 		model.addChild(desc);
 	}
 
+	/**
+	 * Adds the experiment node.
+	 *
+	 * @param element the element
+	 * @param modelName the model name
+	 * @param experimentNodes the experiment nodes
+	 * @param collector the collector
+	 */
 	void addExperimentNode(final ISyntacticElement element, final String modelName,
 			final Map<String, IMap<String, ISyntacticElement>> experimentNodes, final ValidationContext collector) {
 		// First we verify that this experiment has not been declared previously
@@ -312,6 +354,13 @@ void addExperimentNode(final ISyntacticElement element, final String modelName,
 		nodes.put(experimentName, element);
 	}
 
+	/**
+	 * Adds the micro species.
+	 *
+	 * @param macro the macro
+	 * @param micro the micro
+	 * @param cache the cache
+	 */
 	void addMicroSpecies(final SpeciesDescription macro, final ISyntacticElement micro,
 			final Map<String, SpeciesDescription> cache) {
 		// Create the species description without any children. Passing
@@ -328,6 +377,13 @@ void addMicroSpecies(final SpeciesDescription macro, final ISyntacticElement mic
 		micro.visitExperiments(visitor);
 	}
 
+	/**
+	 * Adds the species node.
+	 *
+	 * @param element the element
+	 * @param speciesNodes the species nodes
+	 * @param collector the collector
+	 */
 	void addSpeciesNode(final ISyntacticElement element, final Map<String, ISyntacticElement> speciesNodes,
 			final ValidationContext collector) {
 		final String name = element.getName();
@@ -364,6 +420,12 @@ void complementSpecies(final SpeciesDescription species, final ISyntacticElement
 
 	}
 
+	/**
+	 * Parent experiment.
+	 *
+	 * @param model the model
+	 * @param micro the micro
+	 */
 	void parentExperiment(final ModelDescription model, final ISyntacticElement micro) {
 		// Gather the previously created species
 		final SpeciesDescription mDesc = model.getExperiment(micro.getName());
@@ -376,6 +438,14 @@ void parentExperiment(final ModelDescription model, final ISyntacticElement micr
 		mDesc.setParent(parent);
 	}
 
+	/**
+	 * Parent species.
+	 *
+	 * @param macro the macro
+	 * @param micro the micro
+	 * @param model the model
+	 * @param cache the cache
+	 */
 	void parentSpecies(final SpeciesDescription macro, final ISyntacticElement micro, final ModelDescription model,
 			final Map<String, SpeciesDescription> cache) {
 		// Gather the previously created species
@@ -410,6 +480,12 @@ SpeciesDescription lookupSpecies(final String name, final Map<String, SpeciesDes
 		return result;
 	}
 
+	/**
+	 * Builds the model name.
+	 *
+	 * @param source the source
+	 * @return the string
+	 */
 	protected String buildModelName(final String source) {
 		return source.replace(' ', '_') + ModelDescription.MODEL_SUFFIX;
 	}
diff --git a/ummisco.gama.annotations/src/msi/gama/common/interfaces/IKeyword.java b/ummisco.gama.annotations/src/msi/gama/common/interfaces/IKeyword.java
index 45faa23574..ba7c215687 100644
--- a/ummisco.gama.annotations/src/msi/gama/common/interfaces/IKeyword.java
+++ b/ummisco.gama.annotations/src/msi/gama/common/interfaces/IKeyword.java
@@ -19,6 +19,9 @@
  */
 public interface IKeyword {
 
+	/** The origin. */
+	String ORIGIN = "**origin**";
+
 	/** The dot. */
 	String _DOT = ".";