Bug 485680 : [BPMN] model validation

correcting validation on most commom use cases - multiplicity [0..1] for CatchEvent-base_InitialNode, CatchEvent-base_AcceptEventAction ThrowEvent-base_CallOperationAction BPMNExpression-base_OpaqueExpression, DataOutput-base_Parameter, DataOutput-base_ActivityParameterNode, DataInput-base_Parameter, DataInput-base_ActivityParameterNode, DataInput.base_inputPin, DataOutput.base_outputPin Lane-laneSet, Lane-childLaneSet FlowNode.base_activityNode Gateway-base_ActivityGroup, NonExclusiveGateway-base_JoinNode, NonExclusiveGateway-base_ForkNode, ExclusiveGateway-base_DecisionNode, ExclusiveGateway-base_MergeNode - derived properties LaneSet-lanes, LaneSet-parentLane StandardLoopCharacteristics-testBefore, StandardLoopCharacteristics-loopCondition BPMNProcess-supports BoundaryEvent-attachedToRef FlowElement-container CallActivity-calledElementRef - genmodel java 8 - multiplicity issue : 0..* is generated as 1..* in ecore (change LiteralUnlimitedNatural to LiteralInteger in profile to fix) - log4j - TU - plugin version 0.8.0 Change-Id: I070c4c7cd60ce24706945c1a7dabc8f09289c2c2 Signed-off-by: Géry Deloge <gery.deloge@cea.fr>
author: Géry Deloge 2017-01-26 13:49:06 +0000
committer: Gerrit Code Review @ Eclipse.org 2017-02-10 10:47:30 +0000
commit: 2cbd9bda39f505f21db9ed6e4c0563599d55e474 (patch)
tree: d09f28b30c0b001352e4e8dd7ef15760b676fecf /extraplugins/bpmn/org.eclipse.papyrus.bpmn
parent: b70cc7fed9181951d58828dab215ae040a37f553 (diff)
download: org.eclipse.papyrus-2cbd9bda39f505f21db9ed6e4c0563599d55e474.tar.gz
org.eclipse.papyrus-2cbd9bda39f505f21db9ed6e4c0563599d55e474.tar.xz
org.eclipse.papyrus-2cbd9bda39f505f21db9ed6e4c0563599d55e474.zip
82 files changed, 1223 insertions, 1789 deletions
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/.classpath b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/.classpath
index 16d067f284a..26765d00fab 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/.classpath
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/.classpath
@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="custom-src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF
index e3e0a8f1638..2ccad6039b3 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF
@@ -6,11 +6,14 @@ Export-Package: org.eclipse.papyrus.bpmn,
 Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
  org.eclipse.core.runtime;bundle-version="3.11.0",
  org.eclipse.uml2.uml;bundle-version="5.1.0";visibility:=reexport,
- org.eclipse.papyrus.infra.types.core;bundle-version="2.0.0"
+ org.eclipse.papyrus.infra.types.core;bundle-version="2.0.0",
+ org.apache.log4j;bundle-version="1.2.15",
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 0.7.0.qualifier
+Bundle-Version: 0.8.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.bpmn.Activator
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/build.properties b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/build.properties
index 79ad18952b7..323d0a005cf 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/build.properties
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/build.properties
@@ -1,4 +1,5 @@
-source.. = src/
+source.. = src/,\
+           custom-src
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
@@ -9,5 +10,7 @@ bin.includes = META-INF/,\
                properties/,\
                build.properties,\
                about.html,\
-               pom.xml
-src.includes = about.html
+               pom.xml,\
+               resources/
+src.includes = about.html,\
+               resources/
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BPMNProcessCustom.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BPMNProcessCustom.java
new file mode 100644
index 00000000000..276dfd6b16c
--- /dev/null
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BPMNProcessCustom.java
@@ -0,0 +1,93 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA - Initial API and implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.bpmn.BPMNProfile.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.util.EcoreEList.UnmodifiableEList;
+import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProcess;
+import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage;
+import org.eclipse.papyrus.bpmn.BPMNProfile.BoundaryEvent;
+import org.eclipse.papyrus.bpmn.BPMNProfile.FlowElement;
+import org.eclipse.papyrus.bpmn.BPMNProfile.Task;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.ActivityNode;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.LoopNode;
+import org.eclipse.uml2.uml.OpaqueAction;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+
+public class BPMNProcessCustom {
+
+	private static final Logger log = Logger.getLogger(BPMNProcessCustom.class);
+
+	private BPMNProcessCustom() {
+	}
+
+	private static List<FlowElement> getProcessFlowElements(Activity activity) {
+		List<FlowElement> flowElements = null;
+		List<Element> elements;
+		if ((elements = activity.getOwnedElements()) != null) {
+			flowElements = elements.stream()
+					.map(e -> UMLUtil.getStereotypeApplication(e, FlowElement.class))
+					.filter(Objects::nonNull)
+					.collect(Collectors.toList());
+		}
+		return flowElements;
+	}
+
+	public static EList<FlowElement> getFlowElements(BPMNProcess bpmnProcess) {
+		List<FlowElement> flowElements = new ArrayList<>();
+
+		Activity activity = bpmnProcess.getBase_Activity();
+		if (activity != null) {
+			flowElements.addAll(getProcessFlowElements(activity));
+
+			EList<ActivityNode> nodes = activity.getNodes();
+
+			for (ActivityNode n : nodes) {
+				log.debug("bpmnProcess " + bpmnProcess.getId() +  " contains " + n.getName());
+				if(n instanceof LoopNode){
+					LoopNode loopNode = (LoopNode)n;
+					flowElements.addAll(loopNode.getNodes().stream()
+						.map(e -> UMLUtil.getStereotypeApplication(e, FlowElement.class))
+						.filter(Objects::nonNull)
+						.collect(Collectors.toList()));
+				}
+				if (n instanceof OpaqueAction) {
+					Task task = UMLUtil.getStereotypeApplication(n, Task.class);
+					if (task != null) {
+						EList<BoundaryEvent> boundaryEvents = task.getBoundaryEventRefs();
+						if (boundaryEvents != null && !boundaryEvents.isEmpty()) {
+							flowElements.addAll(boundaryEvents.stream()
+									.map(b -> UMLUtil.getStereotypeApplication(b.getBase_Element(), FlowElement.class))
+									.filter(Objects::nonNull)
+									.collect(Collectors.toList()));
+						}
+
+					}
+				}
+			}
+		}
+
+		// Can't return BasicElist, will throw ClassCastException later, so we need this magic stuff
+		return new UnmodifiableEList<>((BPMNProcessImpl)bpmnProcess, BPMNProfilePackage.eINSTANCE.getFlowElementsContainer_FlowElements(), flowElements.size(), flowElements.toArray());
+	}
+
+}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BaseElementImpl2.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BaseElementImpl2.java
deleted file mode 100644
index 3b163da1024..00000000000
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BaseElementImpl2.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.bpmn.BPMNProfile.impl;
-
-import java.util.Collection;
-
-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.EObject;
-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.EObjectResolvingEList;
-import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNAssociation;
-import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage;
-import org.eclipse.papyrus.bpmn.BPMNProfile.BaseElement;
-import org.eclipse.papyrus.bpmn.BPMNProfile.Documentation;
-import org.eclipse.papyrus.bpmn.BPMNProfile.ExtensionAttributeValue;
-import org.eclipse.papyrus.bpmn.BPMNProfile.ExtensionDefinition;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.DirectedRelationship;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Base Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.bpmn.BPMNProfile.impl.BaseElementImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.papyrus.bpmn.BPMNProfile.impl.BaseElementImpl#getExtensionValues <em>Extension Values</em>}</li>
- *   <li>{@link org.eclipse.papyrus.bpmn.BPMNProfile.impl.BaseElementImpl#getBase_Element <em>Base Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.bpmn.BPMNProfile.impl.BaseElementImpl#getDocumentation <em>Documentation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.bpmn.BPMNProfile.impl.BaseElementImpl#getExtensionDefinitions <em>Extension Definitions</em>}</li>
- *   <li>{@link org.eclipse.papyrus.bpmn.BPMNProfile.impl.BaseElementImpl#getOutgoing <em>Outgoing</em>}</li>
- *   <li>{@link org.eclipse.papyrus.bpmn.BPMNProfile.impl.BaseElementImpl#getIncoming <em>Incoming</em>}</li>
- * </ul>
- *
- * @generated
- */
-public abstract class BaseElementImpl2 extends MinimalEObjectImpl.Container implements BaseElement {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExtensionValues() <em>Extension Values</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtensionValues()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ExtensionAttributeValue> extensionValues;
-
-	/**
-	 * The cached value of the '{@link #getBase_Element() <em>Base Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBase_Element()
-	 * @generated
-	 * @ordered
-	 */
-	protected Element base_Element;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BaseElementImpl2() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return BPMNProfilePackage.eINSTANCE.getBaseElement();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BPMNProfilePackage.BASE_ELEMENT__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ExtensionAttributeValue> getExtensionValues() {
-		if (extensionValues == null) {
-			extensionValues = new EObjectResolvingEList<ExtensionAttributeValue>(ExtensionAttributeValue.class, this, BPMNProfilePackage.BASE_ELEMENT__EXTENSION_VALUES);
-		}
-		return extensionValues;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Element getBase_Element() {
-		if (base_Element != null && base_Element.eIsProxy()) {
-			InternalEObject oldBase_Element = (InternalEObject)base_Element;
-			base_Element = (Element)eResolveProxy(oldBase_Element);
-			if (base_Element != oldBase_Element) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPMNProfilePackage.BASE_ELEMENT__BASE_ELEMENT, oldBase_Element, base_Element));
-			}
-		}
-		return base_Element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Element basicGetBase_Element() {
-		return base_Element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBase_Element(Element newBase_Element) {
-		Element oldBase_Element = base_Element;
-		base_Element = newBase_Element;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BPMNProfilePackage.BASE_ELEMENT__BASE_ELEMENT, oldBase_Element, base_Element));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Documentation> getDocumentation() {
-		// TODO: implement this method to return the 'Documentation' reference list
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ExtensionDefinition> getExtensionDefinitions() {
-		// TODO: implement this method to return the 'Extension Definitions' reference list
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BPMNAssociation getOutgoing() {
-		BPMNAssociation outgoing = basicGetOutgoing();
-		return outgoing != null && outgoing.eIsProxy() ? (BPMNAssociation)eResolveProxy((InternalEObject)outgoing) : outgoing;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public BPMNAssociation basicGetOutgoing() {
-		// TODO: implement this method to return the 'Outgoing' reference
-		// -> do not perform proxy resolution
-		// Ensure that you remove @generated or mark it @generated NOT
-		//throw new UnsupportedOperationException();
-		NamedElement ne = (NamedElement)base_Element;
-		for (Dependency dependency : ne.getClientDependencies()) {
-			EList<EObject> stereotypeApplications = dependency.getStereotypeApplications();
-			for (EObject eObject : stereotypeApplications) {
-				if(eObject instanceof BPMNAssociation){
-					return (BPMNAssociation) eObject;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOutgoing(BPMNAssociation newOutgoing) {
-		// TODO: implement this method to set the 'Outgoing' reference
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BPMNAssociation getIncoming() {
-		BPMNAssociation incoming = basicGetIncoming();
-		return incoming != null && incoming.eIsProxy() ? (BPMNAssociation)eResolveProxy((InternalEObject)incoming) : incoming;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BPMNAssociation basicGetIncoming() {
-		// TODO: implement this method to return the 'Incoming' reference
-		// -> do not perform proxy resolution
-		// Ensure that you remove @generated or mark it @generated NOT
-		NamedElement ne = (NamedElement)base_Element;
-		for (DirectedRelationship dependency : ne.getTargetDirectedRelationships()) {
-			EList<EObject> stereotypeApplications = dependency.getStereotypeApplications();
-			for (EObject eObject : stereotypeApplications) {
-				if(eObject instanceof BPMNAssociation){
-					return (BPMNAssociation) eObject;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIncoming(BPMNAssociation newIncoming) {
-		// TODO: implement this method to set the 'Incoming' reference
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BPMNProfilePackage.BASE_ELEMENT__ID:
-				return getId();
-			case BPMNProfilePackage.BASE_ELEMENT__EXTENSION_VALUES:
-				return getExtensionValues();
-			case BPMNProfilePackage.BASE_ELEMENT__BASE_ELEMENT:
-				if (resolve) return getBase_Element();
-				return basicGetBase_Element();
-			case BPMNProfilePackage.BASE_ELEMENT__DOCUMENTATION:
-				return getDocumentation();
-			case BPMNProfilePackage.BASE_ELEMENT__EXTENSION_DEFINITIONS:
-				return getExtensionDefinitions();
-			case BPMNProfilePackage.BASE_ELEMENT__OUTGOING:
-				if (resolve) return getOutgoing();
-				return basicGetOutgoing();
-			case BPMNProfilePackage.BASE_ELEMENT__INCOMING:
-				if (resolve) return getIncoming();
-				return basicGetIncoming();
-		}
-		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 BPMNProfilePackage.BASE_ELEMENT__ID:
-				setId((String)newValue);
-				return;
-			case BPMNProfilePackage.BASE_ELEMENT__EXTENSION_VALUES:
-				getExtensionValues().clear();
-				getExtensionValues().addAll((Collection<? extends ExtensionAttributeValue>)newValue);
-				return;
-			case BPMNProfilePackage.BASE_ELEMENT__BASE_ELEMENT:
-				setBase_Element((Element)newValue);
-				return;
-			case BPMNProfilePackage.BASE_ELEMENT__DOCUMENTATION:
-				getDocumentation().clear();
-				getDocumentation().addAll((Collection<? extends Documentation>)newValue);
-				return;
-			case BPMNProfilePackage.BASE_ELEMENT__EXTENSION_DEFINITIONS:
-				getExtensionDefinitions().clear();
-				getExtensionDefinitions().addAll((Collection<? extends ExtensionDefinition>)newValue);
-				return;
-			case BPMNProfilePackage.BASE_ELEMENT__OUTGOING:
-				setOutgoing((BPMNAssociation)newValue);
-				return;
-			case BPMNProfilePackage.BASE_ELEMENT__INCOMING:
-				setIncoming((BPMNAssociation)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BPMNProfilePackage.BASE_ELEMENT__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case BPMNProfilePackage.BASE_ELEMENT__EXTENSION_VALUES:
-				getExtensionValues().clear();
-				return;
-			case BPMNProfilePackage.BASE_ELEMENT__BASE_ELEMENT:
-				setBase_Element((Element)null);
-				return;
-			case BPMNProfilePackage.BASE_ELEMENT__DOCUMENTATION:
-				getDocumentation().clear();
-				return;
-			case BPMNProfilePackage.BASE_ELEMENT__EXTENSION_DEFINITIONS:
-				getExtensionDefinitions().clear();
-				return;
-			case BPMNProfilePackage.BASE_ELEMENT__OUTGOING:
-				setOutgoing((BPMNAssociation)null);
-				return;
-			case BPMNProfilePackage.BASE_ELEMENT__INCOMING:
-				setIncoming((BPMNAssociation)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BPMNProfilePackage.BASE_ELEMENT__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case BPMNProfilePackage.BASE_ELEMENT__EXTENSION_VALUES:
-				return extensionValues != null && !extensionValues.isEmpty();
-			case BPMNProfilePackage.BASE_ELEMENT__BASE_ELEMENT:
-				return base_Element != null;
-			case BPMNProfilePackage.BASE_ELEMENT__DOCUMENTATION:
-				return !getDocumentation().isEmpty();
-			case BPMNProfilePackage.BASE_ELEMENT__EXTENSION_DEFINITIONS:
-				return !getExtensionDefinitions().isEmpty();
-			case BPMNProfilePackage.BASE_ELEMENT__OUTGOING:
-				return basicGetOutgoing() != null;
-			case BPMNProfilePackage.BASE_ELEMENT__INCOMING:
-				return basicGetIncoming() != null;
-		}
-		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(" (id: ");
-		result.append(id);
-		result.append(')');
-		return result.toString();
-	}
-
-} //BaseElementImpl
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BoundaryEventCustom.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BoundaryEventCustom.java
new file mode 100644
index 00000000000..5c87e696e12
--- /dev/null
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BoundaryEventCustom.java
@@ -0,0 +1,85 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA - Initial API and implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.bpmn.BPMNProfile.impl;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNActivity;
+import org.eclipse.papyrus.bpmn.BPMNProfile.BoundaryEvent;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.ActivityNode;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.PackageableElement;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+import java.util.List;
+
+public class BoundaryEventCustom {
+
+	private BoundaryEventCustom() {
+	}
+
+	
+	private static BPMNActivity getBoundedActivity(org.eclipse.uml2.uml.Package pack, BoundaryEvent boundaryEvent){
+		
+		BPMNActivity bpmnActivity = null;
+		
+		EList<PackageableElement> packagedElements = pack.getPackagedElements();
+		if (packagedElements != null) {
+			for (PackageableElement e : packagedElements) {
+				if (e instanceof Activity) {
+					Activity activity = (Activity) e;
+					List<ActivityNode> activityNodesList = activity.getNodes();
+					for (ActivityNode node : activityNodesList) {
+						BPMNActivity act = UMLUtil.getStereotypeApplication(node, BPMNActivity.class);
+						if (act != null && !act.getBoundaryEventRefs().isEmpty()) {
+							for (BoundaryEvent be : act.getBoundaryEventRefs()) {
+								if (be == boundaryEvent) {
+									bpmnActivity = act;
+									break;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		return bpmnActivity;
+	}
+	
+	public static BPMNActivity basicGetAttachedToRef(BoundaryEvent boundaryEvent) {
+
+		BPMNActivity bpmnActivity = null;
+		
+		if (boundaryEvent.getBase_ActivityNode() != null) {
+			bpmnActivity = UMLUtil.getStereotypeApplication(boundaryEvent.getBase_ActivityNode(), BPMNActivity.class);
+		}
+		if (bpmnActivity == null) {
+			// try to parse model
+			// dum parsing
+			Element baseElement;
+
+			if((baseElement = boundaryEvent.getBase_Element()) != null){
+				org.eclipse.uml2.uml.Package pack = baseElement.getNearestPackage();
+				org.eclipse.uml2.uml.Package nestingPack = pack;
+				while(bpmnActivity == null && nestingPack != null){
+					// parse up
+					bpmnActivity = getBoundedActivity(nestingPack, boundaryEvent);
+					if(bpmnActivity == null){
+						nestingPack = nestingPack.getNestingPackage();
+					}
+				}	
+			}
+		}
+		return bpmnActivity;
+	}
+}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/CallActivityCustom.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/CallActivityCustom.java
new file mode 100644
index 00000000000..d992acf2d1f
--- /dev/null
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/CallActivityCustom.java
@@ -0,0 +1,31 @@
+package org.eclipse.papyrus.bpmn.BPMNProfile.impl;
+
+import org.eclipse.papyrus.bpmn.BPMNProfile.CallActivity;
+import org.eclipse.papyrus.bpmn.BPMNProfile.CallableElement;
+import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.CallBehaviorAction;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+/**
+ * Created by GD249233 on 01/02/2017.
+ */
+public class CallActivityCustom {
+	
+	private CallActivityCustom(){
+	}
+	
+	public static CallableElement basicGetCalledElementRef(CallActivity callActivity) {
+		CallableElement callableElement = null;
+		Element element = callActivity.getBase_Element();
+		if(element != null && element instanceof CallBehaviorAction){
+			CallBehaviorAction cba = (CallBehaviorAction)element;
+			Behavior behavior = cba.getBehavior();
+			if(behavior != null){
+				callableElement = UMLUtil.getStereotypeApplication(behavior, CallableElement.class);
+			}
+		}
+		
+		return callableElement;
+	}
+}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/FlowElementCustom.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/FlowElementCustom.java
new file mode 100644
index 00000000000..6b39a453309
--- /dev/null
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/FlowElementCustom.java
@@ -0,0 +1,70 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA - Initial API and implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.bpmn.BPMNProfile.impl;
+
+import org.apache.log4j.Logger;
+import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNActivity;
+import org.eclipse.papyrus.bpmn.BPMNProfile.BoundaryEvent;
+import org.eclipse.papyrus.bpmn.BPMNProfile.FlowElement;
+import org.eclipse.papyrus.bpmn.BPMNProfile.FlowElementsContainer;
+import org.eclipse.uml2.uml.ActivityEdge;
+import org.eclipse.uml2.uml.ActivityNode;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Event;
+import org.eclipse.uml2.uml.LoopNode;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+public class FlowElementCustom {
+
+	private static final Logger log = Logger.getLogger(FlowElementCustom.class);
+
+	private FlowElementCustom() {
+	}
+
+	public static FlowElementsContainer basicGetContainer(FlowElement flowElement) {
+		FlowElementsContainer flowElementsContainer = null;
+		Element element = flowElement.getBase_Element();
+		
+		if (element != null) {
+			if (element instanceof ActivityNode || element instanceof ActivityEdge) {
+				Element container = element.getOwner();
+				if (container != null && container instanceof LoopNode) {
+					container = container.getOwner();
+				}
+				if(container != null){
+					log.debug("owner : " + element.getOwner());
+					flowElementsContainer = UMLUtil.getStereotypeApplication(container, FlowElementsContainer.class);
+				}
+			} else if (element instanceof Event) {
+				BoundaryEvent event = UMLUtil.getStereotypeApplication(element, BoundaryEvent.class);
+				if(event != null) {
+					log.debug(event);
+					BPMNActivity bpmnActivity = BoundaryEventCustom.basicGetAttachedToRef(event);
+					Element baseElement;
+					Element container;
+					if (bpmnActivity != null && (baseElement = bpmnActivity.getBase_Element()) != null && (container = baseElement.getOwner()) != null) {
+						flowElementsContainer = UMLUtil.getStereotypeApplication(container, FlowElementsContainer.class);
+						if (flowElementsContainer == null) {
+							log.error("no flowElementsContainer for " + bpmnActivity);
+						}
+					}
+				}
+			}
+		}
+		if (flowElementsContainer == null) {
+			log.error("no container for " + flowElement);
+		}
+		return flowElementsContainer;
+	}
+
+}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/FlowElementImpl.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/FlowElementImpl.java
deleted file mode 100644
index ea24c6f3c8b..00000000000
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/FlowElementImpl.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.bpmn.BPMNProfile.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.BasicEList;
-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.papyrus.bpmn.BPMNProfile.Auditing;
-import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage;
-import org.eclipse.papyrus.bpmn.BPMNProfile.CategoryValue;
-import org.eclipse.papyrus.bpmn.BPMNProfile.FlowElement;
-import org.eclipse.papyrus.bpmn.BPMNProfile.FlowElementsContainer;
-import org.eclipse.papyrus.bpmn.BPMNProfile.Monitoring;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Flow Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.bpmn.BPMNProfile.impl.FlowElementImpl#getAuditing <em>Auditing</em>}</li>
- *   <li>{@link org.eclipse.papyrus.bpmn.BPMNProfile.impl.FlowElementImpl#getMonitoring <em>Monitoring</em>}</li>
- *   <li>{@link org.eclipse.papyrus.bpmn.BPMNProfile.impl.FlowElementImpl#get_categoryValueRef <em>category Value Ref</em>}</li>
- *   <li>{@link org.eclipse.papyrus.bpmn.BPMNProfile.impl.FlowElementImpl#getContainer <em>Container</em>}</li>
- * </ul>
- *
- * @generated
- */
-public abstract class FlowElementImpl extends BaseElementImpl implements FlowElement {
-	/**
-	 * The cached value of the '{@link #getAuditing() <em>Auditing</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuditing()
-	 * @generated
-	 * @ordered
-	 */
-	protected Auditing auditing;
-
-	/**
-	 * The cached value of the '{@link #getMonitoring() <em>Monitoring</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMonitoring()
-	 * @generated
-	 * @ordered
-	 */
-	protected Monitoring monitoring;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FlowElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return BPMNProfilePackage.eINSTANCE.getFlowElement();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Auditing getAuditing() {
-		if (auditing != null && auditing.eIsProxy()) {
-			InternalEObject oldAuditing = (InternalEObject)auditing;
-			auditing = (Auditing)eResolveProxy(oldAuditing);
-			if (auditing != oldAuditing) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPMNProfilePackage.FLOW_ELEMENT__AUDITING, oldAuditing, auditing));
-			}
-		}
-		return auditing;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Auditing basicGetAuditing() {
-		return auditing;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuditing(Auditing newAuditing) {
-		Auditing oldAuditing = auditing;
-		auditing = newAuditing;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BPMNProfilePackage.FLOW_ELEMENT__AUDITING, oldAuditing, auditing));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Monitoring getMonitoring() {
-		if (monitoring != null && monitoring.eIsProxy()) {
-			InternalEObject oldMonitoring = (InternalEObject)monitoring;
-			monitoring = (Monitoring)eResolveProxy(oldMonitoring);
-			if (monitoring != oldMonitoring) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPMNProfilePackage.FLOW_ELEMENT__MONITORING, oldMonitoring, monitoring));
-			}
-		}
-		return monitoring;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Monitoring basicGetMonitoring() {
-		return monitoring;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMonitoring(Monitoring newMonitoring) {
-		Monitoring oldMonitoring = monitoring;
-		monitoring = newMonitoring;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BPMNProfilePackage.FLOW_ELEMENT__MONITORING, oldMonitoring, monitoring));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<CategoryValue> get_categoryValueRef() {
-		// TODO: implement this method to return the 'category Value Ref' reference list
-		// Ensure that you remove @generated or mark it @generated NOT
-		return new BasicEList<CategoryValue>();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FlowElementsContainer getContainer() {
-		FlowElementsContainer container = basicGetContainer();
-		return container != null && container.eIsProxy() ? (FlowElementsContainer)eResolveProxy((InternalEObject)container) : container;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FlowElementsContainer basicGetContainer() {
-		// TODO: implement this method to return the 'Container' reference
-		// -> do not perform proxy resolution
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContainer(FlowElementsContainer newContainer) {
-		// TODO: implement this method to set the 'Container' reference
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BPMNProfilePackage.FLOW_ELEMENT__AUDITING:
-				if (resolve) return getAuditing();
-				return basicGetAuditing();
-			case BPMNProfilePackage.FLOW_ELEMENT__MONITORING:
-				if (resolve) return getMonitoring();
-				return basicGetMonitoring();
-			case BPMNProfilePackage.FLOW_ELEMENT__CATEGORY_VALUE_REF:
-				return get_categoryValueRef();
-			case BPMNProfilePackage.FLOW_ELEMENT__CONTAINER:
-				if (resolve) return getContainer();
-				return basicGetContainer();
-		}
-		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 BPMNProfilePackage.FLOW_ELEMENT__AUDITING:
-				setAuditing((Auditing)newValue);
-				return;
-			case BPMNProfilePackage.FLOW_ELEMENT__MONITORING:
-				setMonitoring((Monitoring)newValue);
-				return;
-			case BPMNProfilePackage.FLOW_ELEMENT__CATEGORY_VALUE_REF:
-				get_categoryValueRef().clear();
-				get_categoryValueRef().addAll((Collection<? extends CategoryValue>)newValue);
-				return;
-			case BPMNProfilePackage.FLOW_ELEMENT__CONTAINER:
-				setContainer((FlowElementsContainer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BPMNProfilePackage.FLOW_ELEMENT__AUDITING:
-				setAuditing((Auditing)null);
-				return;
-			case BPMNProfilePackage.FLOW_ELEMENT__MONITORING:
-				setMonitoring((Monitoring)null);
-				return;
-			case BPMNProfilePackage.FLOW_ELEMENT__CATEGORY_VALUE_REF:
-				get_categoryValueRef().clear();
-				return;
-			case BPMNProfilePackage.FLOW_ELEMENT__CONTAINER:
-				setContainer((FlowElementsContainer)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BPMNProfilePackage.FLOW_ELEMENT__AUDITING:
-				return auditing != null;
-			case BPMNProfilePackage.FLOW_ELEMENT__MONITORING:
-				return monitoring != null;
-			case BPMNProfilePackage.FLOW_ELEMENT__CATEGORY_VALUE_REF:
-				return !get_categoryValueRef().isEmpty();
-			case BPMNProfilePackage.FLOW_ELEMENT__CONTAINER:
-				return basicGetContainer() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //FlowElementImpl
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneCustom.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneCustom.java
new file mode 100644
index 00000000000..eac284640e8
--- /dev/null
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneCustom.java
@@ -0,0 +1,66 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.bpmn.BPMNProfile.impl;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import org.apache.log4j.Logger;
+import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfileFactory;
+import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage;
+import org.eclipse.papyrus.bpmn.BPMNProfile.Lane;
+import org.eclipse.papyrus.bpmn.BPMNProfile.LaneSet;
+import org.eclipse.uml2.uml.ActivityPartition;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
+
+public class LaneCustom {
+	private static final Logger log = Logger.getLogger(LaneCustom.class);
+
+	private LaneCustom() {
+	}
+
+	public static LaneSet basicGetChildLaneSet(Lane lane) {
+		LaneSet laneSet = null;
+		ActivityPartition activityPartition = lane.getBase_ActivityPartition();
+		if(activityPartition != null) {
+			laneSet = UMLUtil.getStereotypeApplication(activityPartition, LaneSet.class);
+		}
+		
+/*		if(activityPartition != null){
+			List<ActivityPartition> subPartitions = activityPartition.getSubpartitions();
+			if(subPartitions != null && !subPartitions.isEmpty()){
+				laneSet = BPMNProfileFactory.eINSTANCE.createLaneSet();
+				laneSet.setBase_ActivityPartition(activityPartition);
+				List<Lane> lanes = subPartitions.stream().map(p -> UMLUtil.getStereotypeApplication(p, Lane.class)).filter(Objects::nonNull).collect(Collectors.toList());
+				laneSet.getLanes().addAll(lanes);
+				log.debug(lanes);
+			}
+		}*/
+		return laneSet;
+	}
+
+
+	public static LaneSet basicGetLaneSet(Lane lane) {
+		LaneSet laneSet = null;
+		ActivityPartition activityPartition = lane.getBase_ActivityPartition();
+		if(activityPartition != null) {
+			ActivityPartition superPartition = activityPartition.getSuperPartition();
+			if(superPartition != null){
+				laneSet = UMLUtil.getStereotypeApplication(superPartition, LaneSet.class);
+			}
+		}
+		return laneSet;
+	}
+}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneSetCustom.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneSetCustom.java
new file mode 100644
index 00000000000..654fe001218
--- /dev/null
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneSetCustom.java
@@ -0,0 +1,45 @@
+package org.eclipse.papyrus.bpmn.BPMNProfile.impl;
+
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.util.EcoreEList.UnmodifiableEList;
+import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage;
+import org.eclipse.papyrus.bpmn.BPMNProfile.Lane;
+import org.eclipse.papyrus.bpmn.BPMNProfile.LaneSet;
+import org.eclipse.uml2.uml.ActivityPartition;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * Created by GD249233 on 24/01/2017.
+ */
+public class LaneSetCustom {
+
+	private LaneSetCustom() {
+	}
+
+	public static EList<Lane> getLanes(LaneSet laneSet){
+		List<Lane> lanes = new ArrayList<>();
+		ActivityPartition activityPartition = laneSet.getBase_ActivityPartition();
+		if(activityPartition != null) {
+			List<ActivityPartition> subPartitions = activityPartition.getSubpartitions();
+			if (subPartitions != null && !subPartitions.isEmpty()) {
+				lanes = subPartitions.stream().map(p -> UMLUtil.getStereotypeApplication(p, Lane.class)).filter(Objects::nonNull).collect(Collectors.toList());
+			}
+		}
+		return new BasicEList<>(lanes);
+//		return new UnmodifiableEList<>((laneSetImpl)laneSet, BPMNProfilePackage.eINSTANCE.getFlowElementsContainer_FlowElements(), lanes.size(), lanes.toArray());
+	}
+	
+	public static EList<Lane> getParentLane(LaneSet laneSet){
+		ActivityPartition activityPartition = laneSet.getBase_ActivityPartition();
+		Lane lane = UMLUtil.getStereotypeApplication(activityPartition, Lane.class);
+		List<Lane> lanes = new ArrayList<>();
+		lanes.add(lane);
+		return new BasicEList<>(lanes);
+	}
+}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/StandardLoopCharacteristicsCustom.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/StandardLoopCharacteristicsCustom.java
new file mode 100644
index 00000000000..7bc5098957c
--- /dev/null
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/StandardLoopCharacteristicsCustom.java
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.bpmn.BPMNProfile.impl;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNExpression;
+import org.eclipse.papyrus.bpmn.BPMNProfile.StandardLoopCharacteristics;
+import org.eclipse.uml2.uml.ExecutableNode;
+import org.eclipse.uml2.uml.LoopNode;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+
+public class StandardLoopCharacteristicsCustom {
+
+	private StandardLoopCharacteristicsCustom() {
+	}
+
+	public static boolean isTestBefore(StandardLoopCharacteristics s) {
+		boolean isTestBefore = false;
+		LoopNode loopNode = s.getBase_LoopNode();
+		if (loopNode != null) {
+			isTestBefore = loopNode.isTestedFirst();
+		}
+
+		return isTestBefore;
+	}
+
+	public static BPMNExpression basicGetLoopCondition(StandardLoopCharacteristics s) {
+		BPMNExpression expression = null;
+		LoopNode loopNode = s.getBase_LoopNode();
+		if (loopNode != null) {
+			EList<ExecutableNode> nodes = loopNode.getTests();
+			if (nodes != null && !nodes.isEmpty()) {
+				expression = UMLUtil.getStereotypeApplication(nodes.get(0), BPMNExpression.class);
+			}
+		}
+		return expression;
+	}
+}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/util/BPMNResource.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/util/BPMNResource.java
new file mode 100644
index 00000000000..a9b1db63a2c
--- /dev/null
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/custom-src/org/eclipse/papyrus/bpmn/util/BPMNResource.java
@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.bpmn.util;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.UMLPackage.Literals;
+
+public class BPMNResource {
+
+	public static final String UML_PROFILE = "pathmap://UML_PROFILES/Standard.profile.uml";
+	public static final String BPMN_PROFILE = "pathmap://BPMN_PROF/bpmn.profile.uml";
+
+	private BPMNResource(){
+	}
+	
+	public static Model createBPMNModel(){
+		String modelName = "test";
+		String resourceName = "test.uml";
+		ResourceSet resourceSet = new ResourceSetImpl();
+		
+		Model model = UMLFactory.eINSTANCE.createModel();
+		model.setName(modelName);
+		URI createURI = URI.createURI(resourceName);
+		Resource resource = resourceSet.createResource(createURI);
+		resource.getContents().add(model);
+        Resource standardProfileResource = resourceSet.getResource(URI.createURI(UML_PROFILE), true);
+        Profile umlStdProfile = (Profile)EcoreUtil.getObjectByType(standardProfileResource.getContents(), Literals.PACKAGE);
+        model.applyProfile(umlStdProfile);
+        Resource bpmnProfileResource = resourceSet.getResource(URI.createURI(BPMN_PROFILE), true);
+        Profile bpmnProfile = (Profile)EcoreUtil.getObjectByType(bpmnProfileResource.getContents(), Literals.PACKAGE);
+        model.applyProfile(bpmnProfile);
+        return model;
+	}
+}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/BPMNProfile.ecore b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/BPMNProfile.ecore
index e90aa8b4569..544977c4021 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/BPMNProfile.ecore
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/BPMNProfile.ecore
@@ -31,19 +31,19 @@
   <eClassifiers xsi:type="ecore:EClass" name="NonExclusiveGateway" abstract="true"
       eSuperTypes="#//Gateway">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_JoinNode" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//JoinNode"/>
+        eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//JoinNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ForkNode" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ForkNode"/>
+        eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ForkNode"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Gateway" abstract="true" eSuperTypes="#//FlowNode">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ControlNode" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ControlNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityGroup" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityGroup"/>
+        eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityGroup"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FlowNode" abstract="true" eSuperTypes="#//FlowElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityNode" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityNode"/>
+        eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityNode"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FlowElement" abstract="true" eSuperTypes="#//BaseElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="auditing" ordered="false"
@@ -51,28 +51,29 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="monitoring" ordered="false"
         eType="#//Monitoring"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="_categoryValueRef" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//CategoryValue" eOpposite="#//CategoryValue/categorizedFlowElements">
+        upperBound="-1" eType="#//CategoryValue" eOpposite="#//CategoryValue/categorizedFlowElements">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value=" categoryValueRef"/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="container" ordered="false"
-        lowerBound="1" eType="#//FlowElementsContainer" eOpposite="#//FlowElementsContainer/flowElements"/>
+        lowerBound="1" eType="#//FlowElementsContainer" changeable="false" volatile="true"
+        transient="true" derived="true" eOpposite="#//FlowElementsContainer/flowElements"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BaseElement" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="extensionValues" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ExtensionAttributeValue"/>
+        upperBound="-1" eType="#//ExtensionAttributeValue"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Element" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Element"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="documentation" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Documentation"/>
+        upperBound="-1" eType="#//Documentation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="extensionDefinitions" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ExtensionDefinition"/>
+        upperBound="-1" eType="#//ExtensionDefinition"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNAssociation" eOpposite="#//BPMNAssociation/sourceRef"/>
+        upperBound="-1" eType="#//BPMNAssociation" eOpposite="#//BPMNAssociation/sourceRef"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNAssociation" eOpposite="#//BPMNAssociation/targetRef"/>
+        upperBound="-1" eType="#//BPMNAssociation" eOpposite="#//BPMNAssociation/targetRef"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ExtensionAttributeValue">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Slot" ordered="false"
@@ -102,7 +103,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Stereotype" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Stereotype"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="extensionAttributeDefinitions"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//ExtensionAttributeDefinition"/>
+        ordered="false" upperBound="-1" eType="#//ExtensionAttributeDefinition"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BPMNAssociation" eSuperTypes="#//BPMNArtifact">
     <eOperations name="AssociationEnd" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -151,14 +152,15 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_EnumerationLiteral"
         ordered="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//EnumerationLiteral"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="categorizedFlowElements"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//FlowElement" eOpposite="#//FlowElement/_categoryValueRef"/>
+        ordered="false" upperBound="-1" eType="#//FlowElement" eOpposite="#//FlowElement/_categoryValueRef"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FlowElementsContainer" abstract="true"
       eSuperTypes="#//BaseElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="laneSets" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//LaneSet" eOpposite="#//LaneSet/flowElementsContainer"/>
+        upperBound="-1" eType="#//LaneSet" eOpposite="#//LaneSet/flowElementsContainer"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="flowElements" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//FlowElement" eOpposite="#//FlowElement/container"/>
+        upperBound="-1" eType="#//FlowElement" changeable="false" volatile="true"
+        transient="true" derived="true" eOpposite="#//FlowElement/container"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="LaneSet" eSuperTypes="#//BaseElement">
     <eOperations name="LaneSetlanes" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -249,9 +251,11 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityPartition"
         ordered="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityPartition"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="lanes" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Lane" eOpposite="#//Lane/laneSet"/>
+        upperBound="-1" eType="#//Lane" changeable="false" volatile="true" transient="true"
+        derived="true" eOpposite="#//Lane/laneSet"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="parentLane" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Lane"/>
+        upperBound="-1" eType="#//Lane" changeable="false" volatile="true" transient="true"
+        derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="flowElementsContainer"
         ordered="false" eType="#//FlowElementsContainer" eOpposite="#//FlowElementsContainer/laneSets"/>
   </eClassifiers>
@@ -353,17 +357,18 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="flowNodeRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//FlowNode"/>
+        upperBound="-1" eType="#//FlowNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="partitionElementRef" ordered="false"
         eType="#//BaseElement"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="childLaneSet" ordered="false"
-        lowerBound="1" eType="#//LaneSet">
+        eType="#//LaneSet" changeable="false" volatile="true" transient="true" derived="true">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="childLaneSet "/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="laneSet" ordered="false"
-        lowerBound="1" eType="#//LaneSet" eOpposite="#//LaneSet/lanes"/>
+        eType="#//LaneSet" changeable="false" volatile="true" transient="true" derived="true"
+        eOpposite="#//LaneSet/lanes"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SequenceFlow" eSuperTypes="#//FlowElement">
     <eOperations name="SequenceFlowconditionExpression" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -441,7 +446,7 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BPMNExpression" eSuperTypes="#//BaseElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_OpaqueExpression"
-        ordered="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//OpaqueExpression"/>
+        ordered="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//OpaqueExpression"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EventBasedGateway" eSuperTypes="#//Gateway">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="instantiate" ordered="false"
@@ -563,9 +568,9 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_DecisionNode" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//DecisionNode"/>
+        eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//DecisionNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_MergeNode" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//MergeNode"/>
+        eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//MergeNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="default" ordered="false"
         eType="#//SequenceFlow"/>
   </eClassifiers>
@@ -589,13 +594,13 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="exporterVersion" ordered="false"
         lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="extensions" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNExtension"/>
+        upperBound="-1" eType="#//BPMNExtension"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="imports" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Import"/>
+        upperBound="-1" eType="#//Import"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="relationships" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNRelationship"/>
+        upperBound="-1" eType="#//BPMNRelationship"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="rootElements" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//RootElement" eOpposite="#//RootElement/definition"/>
+        upperBound="-1" eType="#//RootElement" eOpposite="#//RootElement/definition"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BPMNExtension">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Stereotype" ordered="false"
@@ -763,15 +768,16 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Activity" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Activity"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlationSubscriptions"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//CorrelationSubscription"/>
+        ordered="false" upperBound="-1" eType="#//CorrelationSubscription"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="monitoring" ordered="false"
         eType="#//Monitoring"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="supports" ordered="false"
-        lowerBound="1" eType="#//BPMNProcess"/>
+        lowerBound="1" eType="#//BPMNProcess" changeable="false" volatile="true" transient="true"
+        derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="properties" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNProperty"/>
+        upperBound="-1" eType="#//BPMNProperty"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="resources" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ResourceRole" eOpposite="#//ResourceRole/process"/>
+        upperBound="-1" eType="#//ResourceRole" eOpposite="#//ResourceRole/process"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CallableElement" abstract="true" eSuperTypes="#//RootElement">
     <eOperations name="CallableEelementsupportedInterfaceRefs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -823,9 +829,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="ioSpecification" ordered="false"
         eType="#//InputOutputSpecification"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="supportedInterfaceRefs"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//BPMNInterface"/>
+        ordered="false" upperBound="-1" eType="#//BPMNInterface"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="ioBinding" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//InputOutputBinding"/>
+        upperBound="-1" eType="#//InputOutputBinding"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="InputOutputSpecification" eSuperTypes="#//BaseElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Behavior" ordered="false"
@@ -833,9 +839,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Action" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Action"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataInputs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataInput"/>
+        upperBound="-1" eType="#//DataInput"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataOutputs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataOutput"/>
+        upperBound="-1" eType="#//DataOutput"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="inputSets" ordered="false"
         lowerBound="1" upperBound="-1" eType="#//InputSet"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outputSets" ordered="false"
@@ -912,17 +918,17 @@
         lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
         defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_InputPin" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//InputPin"/>
+        eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//InputPin"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Parameter" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>
+        eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityParameterNode"
-        ordered="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityParameterNode"/>
+        ordered="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityParameterNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="inputSetRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//InputSet" eOpposite="#//InputSet/dataInputRefs"/>
+        upperBound="-1" eType="#//InputSet" eOpposite="#//InputSet/dataInputRefs"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="inputSetWithOptional" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//InputSet" eOpposite="#//InputSet/optionalInputRefs"/>
+        upperBound="-1" eType="#//InputSet" eOpposite="#//InputSet/optionalInputRefs"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="inputSetWithWhileExecuting"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//InputSet" eOpposite="#//InputSet/whileExecutingInputRefs"/>
+        ordered="false" upperBound="-1" eType="#//InputSet" eOpposite="#//InputSet/whileExecutingInputRefs"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ItemAwareElement" abstract="true" eSuperTypes="#//BaseElement">
     <eOperations name="ItemAwareElementdataState" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -948,7 +954,7 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataState" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataState"/>
+        upperBound="-1" eType="#//DataState"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_TypedElement" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//TypedElement"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="itemSubjectRef" ordered="false"
@@ -1075,11 +1081,11 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ParameterSet" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ParameterSet"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="optionalInputRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataInput" eOpposite="#//DataInput/inputSetWithOptional"/>
+        upperBound="-1" eType="#//DataInput" eOpposite="#//DataInput/inputSetWithOptional"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="whileExecutingInputRefs"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//DataInput" eOpposite="#//DataInput/inputSetWithWhileExecuting"/>
+        ordered="false" upperBound="-1" eType="#//DataInput" eOpposite="#//DataInput/inputSetWithWhileExecuting"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataInputRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataInput" eOpposite="#//DataInput/inputSetRefs"/>
+        upperBound="-1" eType="#//DataInput" eOpposite="#//DataInput/inputSetRefs"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="DataOutput" eSuperTypes="#//ItemAwareElement">
     <eOperations name="DataOutputnotation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1127,20 +1133,20 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_OutputPin" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//OutputPin"/>
+        eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//OutputPin"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isCollection" ordered="false"
         lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
         defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Parameter" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>
+        eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityParameterNode"
-        ordered="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityParameterNode"/>
+        ordered="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ActivityParameterNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outputSetRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//OutputSet" eOpposite="#//OutputSet/dataOutputRefs"/>
+        upperBound="-1" eType="#//OutputSet" eOpposite="#//OutputSet/dataOutputRefs"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outputSetWithOptional"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//OutputSet"/>
+        ordered="false" upperBound="-1" eType="#//OutputSet"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outputSetWithWhileExecuting"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//OutputSet"/>
+        ordered="false" upperBound="-1" eType="#//OutputSet"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="OutputSet" eSuperTypes="#//BaseElement">
     <eOperations name="OutputSetdataOutputRefs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1212,19 +1218,19 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ParameterSet" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ParameterSet"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="optionalOutputRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataOutput">
+        upperBound="-1" eType="#//DataOutput">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="optionalOutputRefs "/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="whileExecutingOutputRefs"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//DataOutput">
+        ordered="false" upperBound="-1" eType="#//DataOutput">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="whileExecutingOutputRefs "/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataOutputRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataOutput" eOpposite="#//DataOutput/outputSetRefs"/>
+        upperBound="-1" eType="#//DataOutput" eOpposite="#//DataOutput/outputSetRefs"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BPMNInterface" eSuperTypes="#//RootElement">
     <eOperations name="Interfaceoperationmultiplicity" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1320,9 +1326,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="implementationRef" ordered="false"
         eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Element"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="operations" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNOperation"/>
+        upperBound="-1" eType="#//BPMNOperation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="callableElements" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//CallableElement"/>
+        upperBound="-1" eType="#//CallableElement"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BPMNOperation" eSuperTypes="#//BaseElement">
     <eOperations name="BPMNOperationowner" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1422,7 +1428,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="outMessageRef" ordered="false"
         eType="#//BPMNMessage"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="errorRef" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Error"/>
+        upperBound="-1" eType="#//Error"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BPMNMessage" eSuperTypes="#//ItemDefinition">
     <eOperations name="MessageitemRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1499,21 +1505,21 @@
         lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
         defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="participantAssociations"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//ParticipantAssociation"/>
+        ordered="false" upperBound="-1" eType="#//ParticipantAssociation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="conversationLinks" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ConversationLink" eOpposite="#//ConversationLink/collaboration"/>
+        upperBound="-1" eType="#//ConversationLink" eOpposite="#//ConversationLink/collaboration"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="messageFlowAssociations"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//MessageFlowAssociation"/>
+        ordered="false" upperBound="-1" eType="#//MessageFlowAssociation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="messageFlows" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//MessageFlow"/>
+        upperBound="-1" eType="#//MessageFlow"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Collaboration" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Collaboration"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="conversations" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ConversationNode"/>
+        upperBound="-1" eType="#//ConversationNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlationKeys" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//CorrelationKey"/>
+        upperBound="-1" eType="#//CorrelationKey"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="participants" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Participant"/>
+        upperBound="-1" eType="#//Participant"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ParticipantAssociation" eSuperTypes="#//BaseElement">
     <eOperations name="ParticipantAssociationinnerParticipantRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1777,18 +1783,17 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="partnerEntityRef" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//PartnerEntity" eOpposite="#//PartnerEntity/participantRef"/>
+        upperBound="-1" eType="#//PartnerEntity" eOpposite="#//PartnerEntity/participantRef"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="partnerRoleRef" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//PartnerRole" eOpposite="#//PartnerRole/participantRef"/>
+        upperBound="-1" eType="#//PartnerRole" eOpposite="#//PartnerRole/participantRef"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="interfaceRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNInterface"/>
+        upperBound="-1" eType="#//BPMNInterface"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="InteractionNode" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Element" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Element"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingConversationLinks"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//ConversationLink"
-        eOpposite="#//ConversationLink/sourceRef"/>
+        ordered="false" upperBound="-1" eType="#//ConversationLink" eOpposite="#//ConversationLink/sourceRef"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="incomingConversationLinks"
         ordered="false" lowerBound="1" eType="#//ConversationLink" eOpposite="#//ConversationLink/targetRef"/>
   </eClassifiers>
@@ -1836,7 +1841,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_InstanceSpecification"
         ordered="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//InstanceSpecification"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="participantRef" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Participant" eOpposite="#//Participant/partnerEntityRef"/>
+        upperBound="-1" eType="#//Participant" eOpposite="#//Participant/partnerEntityRef"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PartnerRole" eSuperTypes="#//RootElement">
     <eOperations name="PartnerRoleparticipantRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1864,7 +1869,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Class"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="participantRef" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Participant" eOpposite="#//Participant/partnerRoleRef"/>
+        upperBound="-1" eType="#//Participant" eOpposite="#//Participant/partnerRoleRef"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="MessageFlowAssociation" eSuperTypes="#//BaseElement">
     <eOperations name="MessageFlowAssociationinnerMessageFlowRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -2020,9 +2025,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_InformationFlow" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//InformationFlow"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="messageFlowRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//MessageFlow"/>
+        upperBound="-1" eType="#//MessageFlow"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlationKeys" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//CorrelationKey"/>
+        upperBound="-1" eType="#//CorrelationKey"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="participantRefs" ordered="false"
         lowerBound="2" upperBound="-1" eType="#//Participant"/>
   </eClassifiers>
@@ -2030,7 +2035,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Class"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlationPropertyRef"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//CorrelationProperty"/>
+        ordered="false" upperBound="-1" eType="#//CorrelationProperty"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CorrelationProperty" eSuperTypes="#//BaseElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false"
@@ -2080,7 +2085,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlationKeyRef" ordered="false"
         lowerBound="1" eType="#//CorrelationKey"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlationPropertyBinding"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//CorrelationPropertyBinding"/>
+        ordered="false" upperBound="-1" eType="#//CorrelationPropertyBinding"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CorrelationPropertyBinding" eSuperTypes="#//BaseElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false"
@@ -2258,7 +2263,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="resourceRef" ordered="false"
         eType="#//Resource"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="resourceParameterBindings"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//ResourceParameterBinding">
+        ordered="false" upperBound="-1" eType="#//ResourceParameterBinding">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="resourceParameterBindings "/>
       </eAnnotations>
@@ -2316,7 +2321,7 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="resourceParameters" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ResourceParameter"/>
+        upperBound="-1" eType="#//ResourceParameter"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ResourceParameter" eSuperTypes="#//BaseElement">
     <eOperations name="ResourceParameterowner" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -2493,9 +2498,9 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="script" unique="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scriptFormat" lowerBound="1"
         upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scriptFormat" upperBound="-1"
+        eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GlobalTask" eSuperTypes="#//CallableElement">
     <eOperations name="GlobalTasksupportedInterfaceRefs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -2523,7 +2528,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_OpaqueBehavior" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//OpaqueBehavior"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="resources" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ResourceRole"/>
+        upperBound="-1" eType="#//ResourceRole"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GlobalBusinessRuleTask" eSuperTypes="#//GlobalTask">
     <eOperations name="GlobalBusinessRuleTaskimplementation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -2549,7 +2554,7 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="implementation" unique="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"
+        upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"
         defaultValueLiteral="##unspecified"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CompensateEventDefinition" eSuperTypes="#//EventDefinition">
@@ -2712,19 +2717,19 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="activityClass" ordered="false"
         eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Class"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="properties" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNProperty"/>
+        upperBound="-1" eType="#//BPMNProperty"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="default" ordered="false"
         eType="#//SequenceFlow"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="boundaryEventRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BoundaryEvent"/>
+        upperBound="-1" eType="#//BoundaryEvent"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataInputAssociations"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//DataInputAssociation"/>
+        ordered="false" upperBound="-1" eType="#//DataInputAssociation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataOutputAssociations"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//DataOutputAssociation"/>
+        ordered="false" upperBound="-1" eType="#//DataOutputAssociation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="loopCharacteristics" ordered="false"
         eType="#//LoopCharacteristics"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="resources" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ResourceRole"/>
+        upperBound="-1" eType="#//ResourceRole"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BoundaryEvent" eSuperTypes="#//CatchEvent">
     <eOperations name="boundaryEventattachedToRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -2752,7 +2757,8 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelActivity" ordered="false"
         lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="attachedToRef" ordered="false"
-        lowerBound="1" eType="#//BPMNActivity"/>
+        lowerBound="1" eType="#//BPMNActivity" changeable="false" volatile="true"
+        transient="true" derived="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CatchEvent" abstract="true" eSuperTypes="#//BPMNEvent">
     <eOperations name="catchEventeventDefinitionsRefs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -2781,25 +2787,25 @@
         lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
         defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_AcceptEventAction"
-        ordered="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//AcceptEventAction"/>
+        ordered="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//AcceptEventAction"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_InitialNode" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//InitialNode"/>
+        eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//InitialNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataOutputAssociation"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//DataOutputAssociation"/>
+        ordered="false" upperBound="-1" eType="#//DataOutputAssociation"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BPMNEvent" abstract="true" eSuperTypes="#//FlowNode">
     <eStructuralFeatures xsi:type="ecore:EReference" name="eventClass" ordered="false"
         eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Class"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="_eventDefinitions" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//EventDefinition">
+        upperBound="-1" eType="#//EventDefinition">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value=" eventDefinitions"/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="properties" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNProperty"/>
+        upperBound="-1" eType="#//BPMNProperty"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="eventDefinitionRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//EventDefinition"/>
+        upperBound="-1" eType="#//EventDefinition"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="DataOutputAssociation" eSuperTypes="#//DataAssociation">
     <eOperations name="dataOutputAssociationsource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -2923,7 +2929,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="transformation" ordered="false"
         lowerBound="1" eType="#//FormalExpression"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="assignment" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Assignment"/>
+        upperBound="-1" eType="#//Assignment"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Assignment" eSuperTypes="#//BaseElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Dependency" ordered="false"
@@ -3084,11 +3090,11 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_CallOperationAction"
-        ordered="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//CallOperationAction"/>
+        ordered="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//CallOperationAction"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_FlowFinalNode" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//FlowFinalNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataInputAssociation" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataInputAssociation"/>
+        upperBound="-1" eType="#//DataInputAssociation"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="MessageEventDefinition" eSuperTypes="#//EventDefinition">
     <eStructuralFeatures xsi:type="ecore:EReference" name="messageRef" ordered="false"
@@ -3139,7 +3145,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//LinkEventDefinition" eOpposite="#//LinkEventDefinition/_target"/>
+        upperBound="-1" eType="#//LinkEventDefinition" eOpposite="#//LinkEventDefinition/_target"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_CallEvent" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//CallEvent"/>
   </eClassifiers>
@@ -3175,7 +3181,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Enumeration" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Enumeration"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="categoryValue" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//CategoryValue"/>
+        upperBound="-1" eType="#//CategoryValue"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Group" eSuperTypes="#//BPMNArtifact">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityPartition"
@@ -3342,7 +3348,7 @@
         lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"
         defaultValueLiteral="##unspecified"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="renderings" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Rendering"/>
+        upperBound="-1" eType="#//Rendering"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Task" eSuperTypes="#//BPMNActivity">
     <eStructuralFeatures xsi:type="ecore:EReference" name="ioSpecification" ordered="false"
@@ -3400,10 +3406,10 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="implementation" unique="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"
+        upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"
         defaultValueLiteral="##unspecified"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="renderings" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Rendering"/>
+        upperBound="-1" eType="#//Rendering"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GlobalManualTask" eSuperTypes="#//GlobalTask"/>
   <eClassifiers xsi:type="ecore:EClass" name="ManualTask" eSuperTypes="#//Task">
@@ -3435,7 +3441,7 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="conversationNodes" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ConversationNode"/>
+        upperBound="-1" eType="#//ConversationNode"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GlobalConversation" eSuperTypes="#//BPMNCollaboration">
     <eOperations name="GlobalConversationcontainedelements" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -3515,7 +3521,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="calledCollaborationRef"
         ordered="false" eType="#//BPMNCollaboration"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="participantAssociations"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//ParticipantAssociation"/>
+        ordered="false" upperBound="-1" eType="#//ParticipantAssociation"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Conversation" eSuperTypes="#//ConversationNode"/>
   <eClassifiers xsi:type="ecore:EClass" name="SubProcess" eSuperTypes="#//BPMNActivity #//FlowElementsContainer">
@@ -3547,7 +3553,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_StructuredActivityNode"
         ordered="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//StructuredActivityNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="hasLaneSets" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//LaneSet"/>
+        upperBound="-1" eType="#//LaneSet"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CallActivity" eSuperTypes="#//BPMNActivity">
     <eOperations name="CallActivitycalledElementRefvalues" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -3575,7 +3581,8 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_CallBehaviorAction"
         ordered="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//CallBehaviorAction"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="calledElementRef" ordered="false"
-        eType="#//CallableElement"/>
+        eType="#//CallableElement" changeable="false" volatile="true" transient="true"
+        derived="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BusinessRuleTask" eSuperTypes="#//Task">
     <eOperations name="BusinessRuleTaskimplementation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -3788,9 +3795,11 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_LoopNode" ordered="false"
         lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//LoopNode"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="testBefore" ordered="false"
-        lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"/>
+        lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
+        changeable="false" volatile="true" transient="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="loopCondition" ordered="false"
-        lowerBound="1" eType="#//BPMNExpression"/>
+        lowerBound="1" eType="#//BPMNExpression" changeable="false" volatile="true"
+        transient="true" derived="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="MultiInstanceBehavior">
     <eLiterals name="none"/>
@@ -3955,6 +3964,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="noneBehaviorEventRef" ordered="false"
         eType="#//EventDefinition"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="complexBehaviorDefinition"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//ComplexBehaviorDefinition"/>
+        ordered="false" upperBound="-1" eType="#//ComplexBehaviorDefinition"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.profile.genmodel b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.profile.genmodel
index 2d21e13562c..8bb4ca3da17 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.profile.genmodel
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.profile.genmodel
@@ -3,7 +3,7 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
     modelDirectory="/org.eclipse.papyrus.bpmn/src" modelPluginID="org.eclipse.papyrus.bpmn"
     modelName="Bpmn" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="7.0" copyrightFields="false"
+    importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="8.0" copyrightFields="false"
     usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"
     operationReflection="true" importOrganizing="true">
   <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
@@ -25,7 +25,7 @@
     <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>
     <details key="REDEFINING_OPERATIONS" value="REPORT"/>
     <details key="INVOCATION_DELEGATES" value="IGNORE"/>
-    <details key="DERIVED_FEATURES" value="IGNORE"/>
+    <details key="DERIVED_FEATURES" value="PROCESS"/>
     <details key="OPERATION_BODIES" value="IGNORE"/>
     <details key="CAMEL_CASE_NAMES" value="IGNORE"/>
     <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.profile.notation b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.profile.notation
index bf9abab340f..8b67c40ac88 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.profile.notation
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.profile.notation
@@ -1,2 +1,121 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_VfrNsNQkEeaodsCMliUChQ" type="PapyrusUMLProfileDiagram" name="ProfileDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_a6oagNQkEeaodsCMliUChQ" type="Stereotype_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_a6wWUNQkEeaodsCMliUChQ" type="Stereotype_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_a6w9YNQkEeaodsCMliUChQ" type="Stereotype_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_a6w9YdQkEeaodsCMliUChQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_a6w9YtQkEeaodsCMliUChQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_a6w9Y9QkEeaodsCMliUChQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a6w9ZNQkEeaodsCMliUChQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_a6w9ZdQkEeaodsCMliUChQ" type="Stereotype_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_a6w9ZtQkEeaodsCMliUChQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_a6w9Z9QkEeaodsCMliUChQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_a6w9aNQkEeaodsCMliUChQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a6w9adQkEeaodsCMliUChQ"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="bpmn.profile.uml#BPMNProfile-Process-BPMNProcess"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a6oagdQkEeaodsCMliUChQ" x="304" y="222"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_b4aRYNQkEeaodsCMliUChQ" type="Stereotype_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_b4cGkNQkEeaodsCMliUChQ" type="Stereotype_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_b4cGkdQkEeaodsCMliUChQ" type="Stereotype_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_b4cGktQkEeaodsCMliUChQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_b4cGk9QkEeaodsCMliUChQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_b4cGlNQkEeaodsCMliUChQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b4cGldQkEeaodsCMliUChQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_b4cGltQkEeaodsCMliUChQ" type="Stereotype_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_b4cGl9QkEeaodsCMliUChQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_b4cGmNQkEeaodsCMliUChQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_b4cGmdQkEeaodsCMliUChQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b4cGmtQkEeaodsCMliUChQ"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="bpmn.profile.uml#BPMNProfile-Process-Monitoring"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b4aRYdQkEeaodsCMliUChQ" x="211" y="64"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_-Zt2MNZ9EeaaL59BLd-NfA" type="Stereotype_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_-ZxgkNZ9EeaaL59BLd-NfA" type="Stereotype_NameLabel"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_-ZyHoNZ9EeaaL59BLd-NfA" type="Stereotype_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_-ZyHodZ9EeaaL59BLd-NfA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_-ZyHotZ9EeaaL59BLd-NfA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_-ZyHo9Z9EeaaL59BLd-NfA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ZyHpNZ9EeaaL59BLd-NfA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_-ZyHpdZ9EeaaL59BLd-NfA" type="Stereotype_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_-ZyHptZ9EeaaL59BLd-NfA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_-ZyHp9Z9EeaaL59BLd-NfA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_-ZyHqNZ9EeaaL59BLd-NfA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-ZyHqdZ9EeaaL59BLd-NfA"/>
+    </children>
+    <element xmi:type="uml:Stereotype" href="bpmn.profile.uml#BPMNProfile-CoreStructure-Common-SequenceFlow"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-Zt2MdZ9EeaaL59BLd-NfA" x="80" y="217"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_-bTxoNZ9EeaaL59BLd-NfA" type="Class_MetaclassShape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_-bUYsNZ9EeaaL59BLd-NfA" type="Class_MetaclassNameLabel"/>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ControlFlow"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-bTxodZ9EeaaL59BLd-NfA" x="76" y="38"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_-b61oNZ9EeaaL59BLd-NfA" type="StereotypeComment">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_-b61odZ9EeaaL59BLd-NfA"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-b7csNZ9EeaaL59BLd-NfA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ControlFlow"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-b61otZ9EeaaL59BLd-NfA" x="200"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_VfrNsdQkEeaodsCMliUChQ" name="diagram_compatibility_version" stringValue="1.2.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_VfrNstQkEeaodsCMliUChQ"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_VfrNs9QkEeaodsCMliUChQ">
+    <owner xmi:type="uml:Profile" href="bpmn.profile.uml#_wrG1oHwkEeOWLfCz6n-rOA"/>
+  </styles>
+  <element xmi:type="uml:Profile" href="bpmn.profile.uml#_wrG1oHwkEeOWLfCz6n-rOA"/>
+  <edges xmi:type="notation:Connector" xmi:id="_b5Ql8NQkEeaodsCMliUChQ" type="Association_Edge" source="_b4aRYNQkEeaodsCMliUChQ" target="_a6oagNQkEeaodsCMliUChQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_b5RNAdQkEeaodsCMliUChQ" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cGrW4NQkEeaodsCMliUChQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_b5R0ENQkEeaodsCMliUChQ" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_b5R0EdQkEeaodsCMliUChQ" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cGyroNQkEeaodsCMliUChQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_b5R0EtQkEeaodsCMliUChQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_b5R0E9QkEeaodsCMliUChQ" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cG8coNQkEeaodsCMliUChQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_b5R0FNQkEeaodsCMliUChQ" x="-15" y="-2"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_b5R0FdQkEeaodsCMliUChQ" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cHE_gNQkEeaodsCMliUChQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_b5R0FtQkEeaodsCMliUChQ" x="15" y="38"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_b5SbINQkEeaodsCMliUChQ" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cHMUQNQkEeaodsCMliUChQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_b5SbIdQkEeaodsCMliUChQ" x="15" y="38"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_b5SbItQkEeaodsCMliUChQ" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_cHU3INQkEeaodsCMliUChQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_b5SbI9QkEeaodsCMliUChQ" x="-15" y="-2"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_b5Ql8dQkEeaodsCMliUChQ"/>
+    <element xmi:type="uml:Association" href="bpmn.profile.uml#BPMNProfile-Process-packagedElement-13"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_b5RNANQkEeaodsCMliUChQ" points="[0, 0, -643984, -643984]$[304, 233, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cHnLANQkEeaodsCMliUChQ" id="(0.85,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cHnLAdQkEeaodsCMliUChQ" id="(0.14,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_-b7csdZ9EeaaL59BLd-NfA" type="StereotypeCommentLink" source="_-bTxoNZ9EeaaL59BLd-NfA" target="_-b61oNZ9EeaaL59BLd-NfA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_-b7cstZ9EeaaL59BLd-NfA"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_-b8DwtZ9EeaaL59BLd-NfA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ControlFlow"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-b7cs9Z9EeaaL59BLd-NfA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-b8DwNZ9EeaaL59BLd-NfA"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-b8DwdZ9EeaaL59BLd-NfA"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_-cp1cNZ9EeaaL59BLd-NfA" type="Extension_Edge" source="_-Zt2MNZ9EeaaL59BLd-NfA" target="_-bTxoNZ9EeaaL59BLd-NfA">
+    <styles xmi:type="notation:FontStyle" xmi:id="_-cp1cdZ9EeaaL59BLd-NfA"/>
+    <element xmi:type="uml:Extension" href="bpmn.profile.uml#BPMNProfile-CoreStructure-Common-packagedElement-3"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-cp1ctZ9EeaaL59BLd-NfA" points="[0, 0, -643984, -643984]$[0, 0, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-rnegNZ9EeaaL59BLd-NfA" id="(0.29,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-roFkNZ9EeaaL59BLd-NfA" id="(0.67,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.profile.uml b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.profile.uml
index bc61a8ecf8d..6f83a6e2cd9 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.profile.uml
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.profile.uml
@@ -11576,6 +11576,8 @@
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Gateways-Gateway-base_ActivityGroup" name="base_ActivityGroup" visibility="public" association="BPMNProfile-CoreStructure-Common-Gateways-packagedElement-15">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityGroup"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4udBUOJWEeafNPB9cvTcXg"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_5glB0OJWEeafNPB9cvTcXg" value="1"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-CoreStructure-Common-Gateways-packagedElement-20" memberEnd="BPMNProfile-CoreStructure-Common-Gateways-packagedElement-20-ownedEnd BPMNProfile-CoreStructure-Common-Gateways-InclusiveGateway-default">
@@ -11628,9 +11630,13 @@
       <generalization xmi:type="uml:Generalization" xmi:id="BPMNProfile-CoreStructure-Common-Gateways-NonExclusiveGateway-generalization" general="BPMNProfile-CoreStructure-Common-Gateways-Gateway"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Gateways-NonExclusiveGateway-base_JoinNode" name="base_JoinNode" visibility="public" association="BPMNProfile-CoreStructure-Common-Gateways-packagedElement-11">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#JoinNode"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pqDOAOJWEeafNPB9cvTcXg"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_qdUeAOJWEeafNPB9cvTcXg" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Gateways-NonExclusiveGateway-base_ForkNode" name="base_ForkNode" visibility="public" association="BPMNProfile-CoreStructure-Common-Gateways-packagedElement-12">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ForkNode"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_n-YWYOJWEeafNPB9cvTcXg"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_ozgnkOJWEeafNPB9cvTcXg" value="1"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="BPMNProfile-CoreStructure-Common-Gateways-ParallelGateway" name="ParallelGateway">
@@ -11679,9 +11685,13 @@
       <generalization xmi:type="uml:Generalization" xmi:id="BPMNProfile-CoreStructure-Common-Gateways-ExclusiveGateway-generalization" general="BPMNProfile-CoreStructure-Common-Gateways-Gateway"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Gateways-ExclusiveGateway-base_DecisionNode" name="base_DecisionNode" visibility="public" association="BPMNProfile-CoreStructure-Common-Gateways-packagedElement-7">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DecisionNode"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_weA1IOJWEeafNPB9cvTcXg"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_xRgHkOJWEeafNPB9cvTcXg" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Gateways-ExclusiveGateway-base_MergeNode" name="base_MergeNode" visibility="public" association="BPMNProfile-CoreStructure-Common-Gateways-packagedElement-6">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#MergeNode"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tTZj8OL-EeaNk-nUJgbcXg"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_uoz3sOL-EeaNk-nUJgbcXg" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Gateways-ExclusiveGateway-default" name="default" visibility="public" type="BPMNProfile-CoreStructure-Common-SequenceFlow" association="BPMNProfile-CoreStructure-Common-Gateways-packagedElement-19" isderived="false">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Gateways-ExclusiveGateway-default-lowerValue"/>
@@ -11771,19 +11781,19 @@
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-extensions" name="extensions" visibility="public" type="BPMNProfile-CoreStructure-Foundation-BPMNExtension" association="BPMNProfile-CoreStructure-Infrastructure-packagedElement-7" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-extensions-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-extensions-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-extensions-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-rootElements" name="rootElements" visibility="public" type="BPMNProfile-CoreStructure-Infrastructure-RootElement" association="BPMNProfile-CoreStructure-Infrastructure-packagedElement-8" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-rootElements-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-rootElements-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-rootElements-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-imports" name="imports" visibility="public" type="BPMNProfile-CoreStructure-Infrastructure-Import" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-imports-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-imports-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-imports-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-relationships" name="relationships" visibility="public" type="BPMNProfile-CoreStructure-Foundation-BPMNRelationship" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-relationships-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-relationships-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Infrastructure-Definitions-relationships-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -11829,12 +11839,12 @@
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-LaneSet-base_ActivityPartition" name="base_ActivityPartition" visibility="public" association="BPMNProfile-Process-packagedElement-16">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityPartition"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-LaneSet-lanes" name="lanes" visibility="public" type="BPMNProfile-Process-Lane" association="BPMNProfile-Process-packagedElement-26" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-LaneSet-lanes-lowerValue"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-LaneSet-lanes" name="lanes" visibility="public" type="BPMNProfile-Process-Lane" isReadOnly="true" isDerived="true" association="BPMNProfile-Process-packagedElement-26" isderived="false">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-LaneSet-lanes-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-LaneSet-lanes-upperValue" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-LaneSet-parentLane" name="parentLane" visibility="public" type="BPMNProfile-Process-Lane" association="BPMNProfile-Process-packagedElement-27" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-LaneSet-parentLane-lowerValue"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-LaneSet-parentLane" name="parentLane" visibility="public" type="BPMNProfile-Process-Lane" isReadOnly="true" isDerived="true" association="BPMNProfile-Process-packagedElement-27" isderived="false">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-LaneSet-parentLane-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-LaneSet-parentLane-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-LaneSet-flowElementsContainer" name="flowElementsContainer" visibility="public" type="BPMNProfile-CoreStructure-Common-FlowElementsContainer" association="BPMNProfile-CoreStructure-Common-packagedElement-42" isderived="false">
@@ -11903,19 +11913,22 @@
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Activity"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-BPMNProcess-correlationSubscriptions" name="correlationSubscriptions" visibility="public" type="BPMNProfile-CoreStructure-Common-CorrelationSubscription" association="BPMNProfile-Process-packagedElement-17">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-BPMNProcess-correlationSubscriptions-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-BPMNProcess-correlationSubscriptions-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-BPMNProcess-correlationSubscriptions-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-BPMNProcess-monitoring" name="monitoring" visibility="public" type="BPMNProfile-Process-Monitoring" association="BPMNProfile-Process-packagedElement-13">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-BPMNProcess-monitoring-lowerValue"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-BPMNProcess-supports" name="supports" visibility="public" type="BPMNProfile-Process-BPMNProcess" association="BPMNProfile-Process-packagedElement-24" isderived="false"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-BPMNProcess-supports" name="supports" visibility="public" type="BPMNProfile-Process-BPMNProcess" isReadOnly="true" isDerived="true" association="BPMNProfile-Process-packagedElement-24" isderived="false">
+        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-BPMNProcess-supports-lowerValue" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-BPMNProcess-supports-upperValue" value="1"/>
+      </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-BPMNProcess-properties" name="properties" visibility="public" type="BPMNProfile-Process-Data-BPMNProperty" association="BPMNProfile-Process-packagedElement-25" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-BPMNProcess-properties-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-BPMNProcess-properties-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-BPMNProcess-properties-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-BPMNProcess-resources" name="resources" visibility="public" type="BPMNProfile-Process-Activities-ResourceRole" association="BPMNProfile-Process-packagedElement-30" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-BPMNProcess-resources-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-BPMNProcess-resources-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-BPMNProcess-resources-upperValue" value="*"/>
       </ownedAttribute>
       <icon xmi:type="uml:Image" xmi:id="_CsTPMLJWEeW3evHeiuWSvw" location="platform:/plugin/org.eclipse.papyrus.bpmn/icons/Process.png">
@@ -11993,15 +12006,21 @@
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Lane-_partitionElement-lowerValue"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Lane-laneSet" name="laneSet" visibility="public" type="BPMNProfile-Process-LaneSet" association="BPMNProfile-Process-packagedElement-26" isderived="false"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Lane-laneSet" name="laneSet" visibility="public" type="BPMNProfile-Process-LaneSet" isReadOnly="true" isDerived="true" association="BPMNProfile-Process-packagedElement-26" isderived="false">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pEdCMN5nEeaxgJm_PRusFg"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_p_uXoN5nEeaxgJm_PRusFg" value="1"/>
+      </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Lane-flowNodeRefs" name="flowNodeRefs" visibility="public" type="BPMNProfile-CoreStructure-Common-FlowNode" association="BPMNProfile-Process-packagedElement-28" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Lane-flowNodeRefs-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Lane-flowNodeRefs-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Lane-flowNodeRefs-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Lane-partitionElementRef" name="partitionElementRef" visibility="public" type="BPMNProfile-CoreStructure-Foundation-BaseElement" association="BPMNProfile-Process-packagedElement-29" isderived="false">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Lane-partitionElementRef-lowerValue"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Lane-childLaneSet_" name="childLaneSet " visibility="public" type="BPMNProfile-Process-LaneSet" isderived="false"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Lane-childLaneSet_" name="childLaneSet " visibility="public" type="BPMNProfile-Process-LaneSet" isReadOnly="true" isDerived="true" isderived="false">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mpVDkN5nEeaxgJm_PRusFg"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_nsz50N5nEeaxgJm_PRusFg" value="1"/>
+      </ownedAttribute>
       <icon xmi:type="uml:Image" xmi:id="_wfB50OmcEeSE8qC-7-3YgA" format="Papyrus" location="platform:/plugin/org.eclipse.papyrus.bpmn/icons/Lane.png">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IE9W8LJLEeW3evHeiuWSvw" source="image_papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IE9-ALJLEeW3evHeiuWSvw" key="image_kind_key" value="icon"/>
@@ -12029,12 +12048,12 @@
       <generalization xmi:type="uml:Generalization" xmi:id="BPMNProfile-Process-GlobalScriptTask-generalization" general="BPMNProfile-Process-GlobalTask"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-GlobalScriptTask-script" name="script" visibility="public" isOrdered="true" isUnique="false" association="BPMNProfile-Process-packagedElement-33" isderived="false">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-GlobalScriptTask-script-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-GlobalScriptTask-script-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-GlobalScriptTask-script-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-GlobalScriptTask-scriptFormat" name="scriptFormat" visibility="public" isOrdered="true" association="BPMNProfile-Process-packagedElement-34" isderived="false">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-GlobalScriptTask-scriptFormat-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-GlobalScriptTask-scriptFormat-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-GlobalScriptTask-scriptFormat-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -12061,7 +12080,7 @@
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#OpaqueBehavior"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-GlobalTask-resources" name="resources" visibility="public" type="BPMNProfile-Process-Activities-ResourceRole" association="BPMNProfile-Process-packagedElement-31" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-GlobalTask-resources-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-GlobalTask-resources-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-GlobalTask-resources-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -12091,7 +12110,7 @@
       <generalization xmi:type="uml:Generalization" xmi:id="BPMNProfile-Process-GlobalBusinessRuleTask-generalization" general="BPMNProfile-Process-GlobalTask"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-GlobalBusinessRuleTask-implementation" name="implementation" visibility="public" isOrdered="true" isUnique="false" association="BPMNProfile-Process-packagedElement-32" isderived="false">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-GlobalBusinessRuleTask-implementation-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-GlobalBusinessRuleTask-implementation-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-GlobalBusinessRuleTask-implementation-upperValue" value="*"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="BPMNProfile-Process-GlobalBusinessRuleTask-implementation-defaultValue" value="##unspecified"/>
       </ownedAttribute>
@@ -12129,13 +12148,13 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-52" memberEnd="BPMNProfile-CoreStructure-Common-Events-packagedElement-52-ownedEnd BPMNProfile-CoreStructure-Common-Events-CompensateEventDefinition-activityRef">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-52-ownedEnd" visibility="public" type="BPMNProfile-CoreStructure-Common-Events-CompensateEventDefinition" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-52">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-52-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-52-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-52-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-14" memberEnd="BPMNProfile-CoreStructure-Common-Events-EscalationEventDefinition-escalationRef BPMNProfile-CoreStructure-Common-Events-packagedElement-14-ownedEnd">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-14-ownedEnd" visibility="public" type="BPMNProfile-CoreStructure-Common-Events-EscalationEventDefinition" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-14">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-14-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-14-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-14-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -12195,7 +12214,7 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-54" memberEnd="BPMNProfile-CoreStructure-Common-Events-packagedElement-54-ownedEnd BPMNProfile-CoreStructure-Common-Events-MessageEventDefinition-messageRef">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-54-ownedEnd" visibility="public" type="BPMNProfile-CoreStructure-Common-Events-MessageEventDefinition" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-54">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-54-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-54-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-54-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -12217,7 +12236,7 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-16" memberEnd="BPMNProfile-CoreStructure-Common-Events-MessageEventDefinition-operationRef BPMNProfile-CoreStructure-Common-Events-packagedElement-16-ownedEnd">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-16-ownedEnd" visibility="public" type="BPMNProfile-CoreStructure-Common-Events-MessageEventDefinition" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-16">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-16-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-16-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-16-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -12297,15 +12316,15 @@
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Events-BPMNEvent-eventClass-lowerValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-BPMNEvent-_eventDefinitions" name=" eventDefinitions" visibility="public" type="BPMNProfile-CoreStructure-Common-Events-EventDefinition" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-48">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-BPMNEvent-_eventDefinitions-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Events-BPMNEvent-_eventDefinitions-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-BPMNEvent-_eventDefinitions-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-BPMNEvent-properties" name="properties" visibility="public" type="BPMNProfile-Process-Data-BPMNProperty" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-56" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-BPMNEvent-properties-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Events-BPMNEvent-properties-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-BPMNEvent-properties-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-BPMNEvent-eventDefinitionRefs" name="eventDefinitionRefs" visibility="public" type="BPMNProfile-CoreStructure-Common-Events-EventDefinition" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-BPMNEvent-eventDefinitionRefs-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Events-BPMNEvent-eventDefinitionRefs-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-BPMNEvent-eventDefinitionRefs-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -12351,12 +12370,16 @@
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-CatchEvent-base_AcceptEventAction" name="base_AcceptEventAction" visibility="public" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-4">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#AcceptEventAction"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AMFsUNc6EeaarKPBv3s3yQ"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_CMHDUNc6EeaarKPBv3s3yQ" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-CatchEvent-base_InitialNode" name="base_InitialNode" visibility="public" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-5">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InitialNode"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y-1B4NjbEeaVxflS-EEn7Q"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_0Je3INjbEeaVxflS-EEn7Q" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-CatchEvent-dataOutputAssociation" name="dataOutputAssociation" visibility="public" type="BPMNProfile-Process-Data-DataOutputAssociation" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-59" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-CatchEvent-dataOutputAssociation-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Events-CatchEvent-dataOutputAssociation-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-CatchEvent-dataOutputAssociation-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -12423,7 +12446,7 @@
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Events-LinkEventDefinition-_target-lowerValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-LinkEventDefinition-source" name="source" visibility="public" type="BPMNProfile-CoreStructure-Common-Events-LinkEventDefinition" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-51">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-LinkEventDefinition-source-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Events-LinkEventDefinition-source-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-LinkEventDefinition-source-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-LinkEventDefinition-base_CallEvent" name="base_CallEvent" visibility="public" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-50">
@@ -12447,7 +12470,7 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-53" memberEnd="BPMNProfile-CoreStructure-Common-Events-packagedElement-53-ownedEnd BPMNProfile-CoreStructure-Common-Events-ErrorEventDefinition-errorRef">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-53-ownedEnd" visibility="public" type="BPMNProfile-CoreStructure-Common-Events-ErrorEventDefinition" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-53">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-53-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-53-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-53-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -12496,12 +12519,14 @@
       <generalization xmi:type="uml:Generalization" xmi:id="BPMNProfile-CoreStructure-Common-Events-ThrowEvent-generalization" general="BPMNProfile-CoreStructure-Common-Events-BPMNEvent"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-ThrowEvent-base_CallOperationAction" name="base_CallOperationAction" visibility="public" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-7">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#CallOperationAction"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MFCQQNc6EeaarKPBv3s3yQ"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_M5w40Nc6EeaarKPBv3s3yQ" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-ThrowEvent-base_FlowFinalNode" name="base_FlowFinalNode" visibility="public" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-8">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#FlowFinalNode"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-ThrowEvent-dataInputAssociation" name="dataInputAssociation" visibility="public" type="BPMNProfile-Process-Data-DataInputAssociation" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-58" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-ThrowEvent-dataInputAssociation-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Events-ThrowEvent-dataInputAssociation-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-ThrowEvent-dataInputAssociation-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -12542,7 +12567,7 @@
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-BoundaryEvent-cancelActivity" name="cancelActivity" visibility="public">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-BoundaryEvent-attachedToRef" name="attachedToRef" visibility="public" type="BPMNProfile-Process-Activities-BPMNActivity" isderived="false"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-BoundaryEvent-attachedToRef" name="attachedToRef" visibility="public" type="BPMNProfile-Process-Activities-BPMNActivity" isReadOnly="true" isDerived="true" isderived="false"/>
       <icon xmi:type="uml:Image" xmi:id="_P3jRUOmcEeSE8qC-7-3YgA" format="Papyrus" location="platform:/plugin/org.eclipse.papyrus.bpmn/icons/BoundaryEvent.png">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Kw_HYIycEeahl9J4idMaeA" source="image_papyrus">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KxAVgIycEeahl9J4idMaeA" key="image_kind_key" value="icon"/>
@@ -12558,7 +12583,7 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-39" memberEnd="BPMNProfile-CoreStructure-Common-Events-packagedElement-39-ownedEnd BPMNProfile-CoreStructure-Common-Events-SignalEventDefinition-signalRef">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-39-ownedEnd" visibility="public" type="BPMNProfile-CoreStructure-Common-Events-SignalEventDefinition" association="BPMNProfile-CoreStructure-Common-Events-packagedElement-39">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-39-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-39-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Events-packagedElement-39-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -12595,7 +12620,7 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-CoreStructure-Common-Artifacts-packagedElement-8" memberEnd="BPMNProfile-CoreStructure-Common-Artifacts-packagedElement-8-ownedEnd BPMNProfile-CoreStructure-Common-Artifacts-Group-_categoryValueRef">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Artifacts-packagedElement-8-ownedEnd" visibility="public" type="BPMNProfile-CoreStructure-Common-Artifacts-Group" association="BPMNProfile-CoreStructure-Common-Artifacts-packagedElement-8">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Artifacts-packagedElement-8-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Artifacts-packagedElement-8-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Artifacts-packagedElement-8-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -12624,7 +12649,7 @@
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Enumeration"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Artifacts-Category-categoryValue" name="categoryValue" visibility="public" type="BPMNProfile-CoreStructure-Common-Artifacts-CategoryValue" association="BPMNProfile-CoreStructure-Common-Artifacts-packagedElement-17" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Artifacts-Category-categoryValue-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Artifacts-Category-categoryValue-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Artifacts-Category-categoryValue-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -12678,7 +12703,7 @@
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#EnumerationLiteral"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Artifacts-CategoryValue-categorizedFlowElements" name="categorizedFlowElements" visibility="public" type="BPMNProfile-CoreStructure-Common-FlowElement" association="BPMNProfile-CoreStructure-Common-Artifacts-packagedElement-12" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Artifacts-CategoryValue-categorizedFlowElements-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Artifacts-CategoryValue-categorizedFlowElements-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Artifacts-CategoryValue-categorizedFlowElements-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -12707,13 +12732,15 @@
       <generalization xmi:type="uml:Generalization" xmi:id="BPMNProfile-CoreStructure-Common-FlowNode-generalization" general="BPMNProfile-CoreStructure-Common-FlowElement"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-FlowNode-base_ActivityNode" name="base_ActivityNode" visibility="public" association="BPMNProfile-CoreStructure-Common-packagedElement-30">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityNode"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_J9hK4NywEeaKmtNtvNnrBw"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_K0vGwNywEeaKmtNtvNnrBw" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-FlowNode-incoming" name="incoming" visibility="public" type="BPMNProfile-CoreStructure-Common-SequenceFlow" association="BPMNProfile-CoreStructure-Common-packagedElement-44" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-FlowNode-incoming-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-FlowNode-incoming-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-FlowNode-incoming-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-FlowNode-outgoing" name="outgoing" visibility="public" type="BPMNProfile-CoreStructure-Common-SequenceFlow" association="BPMNProfile-CoreStructure-Common-packagedElement-45" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-FlowNode-outgoing-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-FlowNode-outgoing-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-FlowNode-outgoing-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -12728,7 +12755,7 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-CoreStructure-Common-packagedElement-53" memberEnd="BPMNProfile-CoreStructure-Common-packagedElement-53-ownedEnd BPMNProfile-CoreStructure-Common-CorrelationPropertyRetrievalExpression-messageRef">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-packagedElement-53-ownedEnd" visibility="public" type="BPMNProfile-CoreStructure-Common-CorrelationPropertyRetrievalExpression" association="BPMNProfile-CoreStructure-Common-packagedElement-53">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-packagedElement-53-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-packagedElement-53-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-packagedElement-53-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -12778,7 +12805,7 @@
       </ownedRule>
       <generalization xmi:type="uml:Generalization" xmi:id="BPMNProfile-CoreStructure-Common-Resource-generalization" general="BPMNProfile-CoreStructure-Common-ItemDefinition"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-Resource-resourceParameters" name="resourceParameters" visibility="public" type="BPMNProfile-CoreStructure-Common-ResourceParameter" association="BPMNProfile-CoreStructure-Common-packagedElement-43" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Resource-resourceParameters-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-Resource-resourceParameters-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-Resource-resourceParameters-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -12814,10 +12841,10 @@
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-FlowElement-monitoring-lowerValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-FlowElement-_categoryValueRef" name=" categoryValueRef" visibility="public" type="BPMNProfile-CoreStructure-Common-Artifacts-CategoryValue" association="BPMNProfile-CoreStructure-Common-Artifacts-packagedElement-12">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-FlowElement-_categoryValueRef-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-FlowElement-_categoryValueRef-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-FlowElement-_categoryValueRef-upperValue" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-FlowElement-container" name="container" visibility="public" type="BPMNProfile-CoreStructure-Common-FlowElementsContainer" association="BPMNProfile-CoreStructure-Common-packagedElement-38" isderived="false"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-FlowElement-container" name="container" visibility="public" type="BPMNProfile-CoreStructure-Common-FlowElementsContainer" isReadOnly="true" isDerived="true" association="BPMNProfile-CoreStructure-Common-packagedElement-38" isderived="false"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-CoreStructure-Common-packagedElement-39" memberEnd="BPMNProfile-CoreStructure-Common-packagedElement-39-ownedEnd BPMNProfile-CoreStructure-Common-SequenceFlow-conditionExpression">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-packagedElement-39-ownedEnd" visibility="public" type="BPMNProfile-CoreStructure-Common-SequenceFlow" association="BPMNProfile-CoreStructure-Common-packagedElement-39"/>
@@ -12837,7 +12864,7 @@
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-CorrelationSubscription-correlationKeyRef" name="correlationKeyRef" visibility="public" type="BPMNProfile-CoreStructure-Common-CorrelationKey" association="BPMNProfile-CoreStructure-Common-packagedElement-49" isderived="false"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-CorrelationSubscription-correlationPropertyBinding" name="correlationPropertyBinding" visibility="public" type="BPMNProfile-CoreStructure-Common-CorrelationPropertyBinding" association="BPMNProfile-CoreStructure-Common-packagedElement-50" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-CorrelationSubscription-correlationPropertyBinding-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-CorrelationSubscription-correlationPropertyBinding-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-CorrelationSubscription-correlationPropertyBinding-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -12860,11 +12887,11 @@
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-CallableElement-ioSpecification-lowerValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-CallableElement-supportedInterfaceRefs" name="supportedInterfaceRefs" visibility="public" type="BPMNProfile-CoreStructure-Service-BPMNInterface" association="BPMNProfile-CoreStructure-Common-packagedElement-46" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-CallableElement-supportedInterfaceRefs-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-CallableElement-supportedInterfaceRefs-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-CallableElement-supportedInterfaceRefs-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-CallableElement-ioBinding" name="ioBinding" visibility="public" type="BPMNProfile-Process-Data-InputOutputBinding" association="BPMNProfile-CoreStructure-Common-packagedElement-36">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-CallableElement-ioBinding-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-CallableElement-ioBinding-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-CallableElement-ioBinding-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -12918,6 +12945,8 @@
       <generalization xmi:type="uml:Generalization" xmi:id="BPMNProfile-CoreStructure-Common-BPMNExpression-generalization" general="BPMNProfile-CoreStructure-Foundation-BaseElement"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-BPMNExpression-base_OpaqueExpression" name="base_OpaqueExpression" visibility="public" association="BPMNProfile-CoreStructure-Common-packagedElement-22">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#OpaqueExpression"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_T7DOgNjgEeaVxflS-EEn7Q"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_U6CmUNjgEeaVxflS-EEn7Q" value="1"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Extension" xmi:id="BPMNProfile-CoreStructure-Common-packagedElement-31" memberEnd="BPMNProfile-CoreStructure-Common-packagedElement-31-ownedEnd BPMNProfile-CoreStructure-Common-ItemDefinition-base_Class" navigableOwnedEnd="BPMNProfile-CoreStructure-Common-packagedElement-31-ownedEnd">
@@ -12974,7 +13003,7 @@
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-CorrelationKey-correlationPropertyRef" name="correlationPropertyRef" visibility="public" type="BPMNProfile-CoreStructure-Common-CorrelationProperty" association="BPMNProfile-CoreStructure-Common-packagedElement-47" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-CorrelationKey-correlationPropertyRef-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-CorrelationKey-correlationPropertyRef-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-CorrelationKey-correlationPropertyRef-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -12983,12 +13012,12 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="BPMNProfile-CoreStructure-Common-FlowElementsContainer" name="FlowElementsContainer" isAbstract="true">
       <generalization xmi:type="uml:Generalization" xmi:id="BPMNProfile-CoreStructure-Common-FlowElementsContainer-generalization" general="BPMNProfile-CoreStructure-Foundation-BaseElement"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-FlowElementsContainer-flowElements" name="flowElements" visibility="public" type="BPMNProfile-CoreStructure-Common-FlowElement" association="BPMNProfile-CoreStructure-Common-packagedElement-38" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-FlowElementsContainer-flowElements-lowerValue"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-FlowElementsContainer-flowElements" name="flowElements" visibility="public" type="BPMNProfile-CoreStructure-Common-FlowElement" isReadOnly="true" association="BPMNProfile-CoreStructure-Common-packagedElement-38" isderived="false">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-FlowElementsContainer-flowElements-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-FlowElementsContainer-flowElements-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Common-FlowElementsContainer-laneSets" name="laneSets" visibility="public" type="BPMNProfile-Process-LaneSet" association="BPMNProfile-CoreStructure-Common-packagedElement-42" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-FlowElementsContainer-laneSets-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Common-FlowElementsContainer-laneSets-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Common-FlowElementsContainer-laneSets-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -13107,27 +13136,27 @@
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ParameterSet"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-OutputSet-dataOutputRefs" name="dataOutputRefs" visibility="public" type="BPMNProfile-Process-Data-DataOutput" association="BPMNProfile-Process-Data-packagedElement-57" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-OutputSet-dataOutputRefs-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-OutputSet-dataOutputRefs-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-OutputSet-dataOutputRefs-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-OutputSet-optionalOutputRefs_" name="optionalOutputRefs " visibility="public" type="BPMNProfile-Process-Data-DataOutput" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-OutputSet-optionalOutputRefs_-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-OutputSet-optionalOutputRefs_-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-OutputSet-optionalOutputRefs_-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-OutputSet-whileExecutingOutputRefs_" name="whileExecutingOutputRefs " visibility="public" type="BPMNProfile-Process-Data-DataOutput" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-OutputSet-whileExecutingOutputRefs_-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-OutputSet-whileExecutingOutputRefs_-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-OutputSet-whileExecutingOutputRefs_-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-Process-Data-packagedElement-23" memberEnd="BPMNProfile-Process-Data-packagedElement-23-ownedEnd BPMNProfile-Process-Data-DataObjectReference-dataObjectRef">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-packagedElement-23-ownedEnd" visibility="public" type="BPMNProfile-Process-Data-DataObjectReference" association="BPMNProfile-Process-Data-packagedElement-23">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-23-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-packagedElement-23-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-23-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-Process-Data-packagedElement-33" memberEnd="BPMNProfile-Process-Data-packagedElement-33-ownedEnd BPMNProfile-Process-Data-DataStoreReference-_dataStore">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-packagedElement-33-ownedEnd" visibility="public" type="BPMNProfile-Process-Data-DataStoreReference" association="BPMNProfile-Process-Data-packagedElement-33">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-33-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-packagedElement-33-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-33-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -13155,15 +13184,15 @@
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ParameterSet"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-InputSet-dataInputRefs" name="dataInputRefs" visibility="public" type="BPMNProfile-Process-Data-DataInput" association="BPMNProfile-Process-Data-packagedElement-54" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-InputSet-dataInputRefs-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-InputSet-dataInputRefs-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-InputSet-dataInputRefs-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-InputSet-optionalInputRefs" name="optionalInputRefs" visibility="public" type="BPMNProfile-Process-Data-DataInput" association="BPMNProfile-Process-Data-packagedElement-55" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-InputSet-optionalInputRefs-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-InputSet-optionalInputRefs-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-InputSet-optionalInputRefs-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-InputSet-whileExecutingInputRefs" name="whileExecutingInputRefs" visibility="public" type="BPMNProfile-Process-Data-DataInput" association="BPMNProfile-Process-Data-packagedElement-56" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-InputSet-whileExecutingInputRefs-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-InputSet-whileExecutingInputRefs-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-InputSet-whileExecutingInputRefs-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -13219,7 +13248,7 @@ Property or an Expression.</body>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-Process-Data-packagedElement-27" memberEnd="BPMNProfile-Process-Data-packagedElement-27-ownedEnd BPMNProfile-Process-Data-ItemAwareElement-dataState">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-packagedElement-27-ownedEnd" visibility="public" type="BPMNProfile-Process-Data-ItemAwareElement" association="BPMNProfile-Process-Data-packagedElement-27">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-27-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-packagedElement-27-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-27-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -13261,6 +13290,8 @@ DataOutput owned by BPMN Activity has no notation. </body>
       <generalization xmi:type="uml:Generalization" xmi:id="BPMNProfile-Process-Data-DataOutput-generalization" general="BPMNProfile-Process-Data-ItemAwareElement"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataOutput-base_OutputPin" name="base_OutputPin" visibility="public" association="BPMNProfile-Process-Data-packagedElement-3">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#OutputPin"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_arT5oN17EeaQFL1kCeUXTA"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_bihOcN17EeaQFL1kCeUXTA" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataOutput-isCollection" name="isCollection" visibility="public">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
@@ -13268,20 +13299,24 @@ DataOutput owned by BPMN Activity has no notation. </body>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataOutput-base_Parameter" name="base_Parameter" visibility="public" association="BPMNProfile-Process-Data-packagedElement-4">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-VWkENlxEeaUpu42JOX4Xg"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="__HqKwNlxEeaUpu42JOX4Xg" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataOutput-base_ActivityParameterNode" name="base_ActivityParameterNode" visibility="public" association="BPMNProfile-Process-Data-packagedElement-36">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityParameterNode"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8kr3sNlxEeaUpu42JOX4Xg"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_9WERUNlxEeaUpu42JOX4Xg" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataOutput-outputSetRefs" name="outputSetRefs" visibility="public" type="BPMNProfile-Process-Data-OutputSet" association="BPMNProfile-Process-Data-packagedElement-57" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-DataOutput-outputSetRefs-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-DataOutput-outputSetRefs-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-DataOutput-outputSetRefs-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataOutput-outputSetWithOptional" name="outputSetWithOptional" visibility="public" type="BPMNProfile-Process-Data-OutputSet" association="BPMNProfile-Process-Data-packagedElement-58" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-DataOutput-outputSetWithOptional-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-DataOutput-outputSetWithOptional-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-DataOutput-outputSetWithOptional-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataOutput-outputSetWithWhileExecuting" name="outputSetWithWhileExecuting" visibility="public" type="BPMNProfile-Process-Data-OutputSet" association="BPMNProfile-Process-Data-packagedElement-59" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-DataOutput-outputSetWithWhileExecuting-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-DataOutput-outputSetWithWhileExecuting-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-DataOutput-outputSetWithWhileExecuting-upperValue" value="*"/>
       </ownedAttribute>
       <icon xmi:type="uml:Image" xmi:id="_dtYYsOmcEeSE8qC-7-3YgA" format="Papyrus" location="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataOutput.png">
@@ -13329,7 +13364,7 @@ Variable owned by SubProcess</body>
       </ownedRule>
       <generalization xmi:type="uml:Generalization" xmi:id="BPMNProfile-Process-Data-ItemAwareElement-generalization" general="BPMNProfile-CoreStructure-Foundation-BaseElement"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-ItemAwareElement-dataState" name="dataState" visibility="public" type="BPMNProfile-Process-Data-DataState" association="BPMNProfile-Process-Data-packagedElement-27">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-ItemAwareElement-dataState-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-ItemAwareElement-dataState-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-ItemAwareElement-dataState-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-ItemAwareElement-base_TypedElement" name="base_TypedElement" visibility="public" association="BPMNProfile-Process-Data-packagedElement-18">
@@ -13357,11 +13392,11 @@ Variable owned by SubProcess</body>
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Action"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-InputOutputSpecification-dataInputs" name="dataInputs" visibility="public" type="BPMNProfile-Process-Data-DataInput" association="BPMNProfile-Process-Data-packagedElement-50" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-InputOutputSpecification-dataInputs-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-InputOutputSpecification-dataInputs-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-InputOutputSpecification-dataInputs-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-InputOutputSpecification-dataOutputs" name="dataOutputs" visibility="public" type="BPMNProfile-Process-Data-DataOutput" association="BPMNProfile-Process-Data-packagedElement-51" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-InputOutputSpecification-dataOutputs-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-InputOutputSpecification-dataOutputs-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-InputOutputSpecification-dataOutputs-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-InputOutputSpecification-inputSets" name="inputSets" visibility="public" type="BPMNProfile-Process-Data-InputSet" association="BPMNProfile-Process-Data-packagedElement-52" isderived="false">
@@ -13380,7 +13415,7 @@ Variable owned by SubProcess</body>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-Process-Data-packagedElement-43" memberEnd="BPMNProfile-Process-Data-packagedElement-43-ownedEnd BPMNProfile-Process-Data-InputOutputBinding-inputDataRef">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-packagedElement-43-ownedEnd" visibility="public" type="BPMNProfile-Process-Data-InputOutputBinding" association="BPMNProfile-Process-Data-packagedElement-43">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-43-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-packagedElement-43-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-43-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -13499,7 +13534,7 @@ scope, e.g. a Data Object, a Property or an Expression.</body>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-Process-Data-packagedElement-44" memberEnd="BPMNProfile-Process-Data-packagedElement-44-ownedEnd BPMNProfile-Process-Data-InputOutputBinding-outputDataRef">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-packagedElement-44-ownedEnd" visibility="public" type="BPMNProfile-Process-Data-InputOutputBinding" association="BPMNProfile-Process-Data-packagedElement-44">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-44-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-packagedElement-44-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-44-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -13535,23 +13570,29 @@ DataInput owned by BPMN Activity has no notation. </body>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataInput-base_InputPin" name="base_InputPin" visibility="public" association="BPMNProfile-Process-Data-packagedElement-7">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InputPin"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kVCFkN1-EeaQFL1kCeUXTA"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_k3LJUN1-EeaQFL1kCeUXTA" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataInput-base_Parameter" name="base_Parameter" visibility="public" association="BPMNProfile-Process-Data-packagedElement-8">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_35eFwNlxEeaUpu42JOX4Xg"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_4qt8gNlxEeaUpu42JOX4Xg" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataInput-base_ActivityParameterNode" name="base_ActivityParameterNode" visibility="public" association="BPMNProfile-Process-Data-packagedElement-35">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityParameterNode"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5hsAwNlxEeaUpu42JOX4Xg"/>
+        <upperValue xmi:type="uml:LiteralInteger" xmi:id="_6INOMNlxEeaUpu42JOX4Xg" value="1"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataInput-inputSetRefs" name="inputSetRefs" visibility="public" type="BPMNProfile-Process-Data-InputSet" association="BPMNProfile-Process-Data-packagedElement-54" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-DataInput-inputSetRefs-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-DataInput-inputSetRefs-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-DataInput-inputSetRefs-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataInput-inputSetWithOptional" name="inputSetWithOptional" visibility="public" type="BPMNProfile-Process-Data-InputSet" association="BPMNProfile-Process-Data-packagedElement-55" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-DataInput-inputSetWithOptional-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-DataInput-inputSetWithOptional-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-DataInput-inputSetWithOptional-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataInput-inputSetWithWhileExecuting" name="inputSetWithWhileExecuting" visibility="public" type="BPMNProfile-Process-Data-InputSet" association="BPMNProfile-Process-Data-packagedElement-56" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-DataInput-inputSetWithWhileExecuting-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-DataInput-inputSetWithWhileExecuting-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-DataInput-inputSetWithWhileExecuting-upperValue" value="*"/>
       </ownedAttribute>
       <icon xmi:type="uml:Image" xmi:id="_aVt5UOmcEeSE8qC-7-3YgA" format="Papyrus" location="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataInput.png">
@@ -13578,7 +13619,7 @@ DataInput owned by BPMN Activity has no notation. </body>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-Process-Data-packagedElement-59" memberEnd="BPMNProfile-Process-Data-packagedElement-59-ownedEnd BPMNProfile-Process-Data-DataOutput-outputSetWithWhileExecuting">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-packagedElement-59-ownedEnd" name="whileExecutingOutputRefs" visibility="public" type="BPMNProfile-Process-Data-DataOutput" association="BPMNProfile-Process-Data-packagedElement-59" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-59-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-packagedElement-59-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-59-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -13594,7 +13635,7 @@ DataInput owned by BPMN Activity has no notation. </body>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-Process-Data-packagedElement-57" memberEnd="BPMNProfile-Process-Data-OutputSet-dataOutputRefs BPMNProfile-Process-Data-DataOutput-outputSetRefs"/>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-Process-Data-packagedElement-58" memberEnd="BPMNProfile-Process-Data-packagedElement-58-ownedEnd BPMNProfile-Process-Data-DataOutput-outputSetWithOptional">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-packagedElement-58-ownedEnd" name="optionalOutputRefs" visibility="public" type="BPMNProfile-Process-Data-DataOutput" association="BPMNProfile-Process-Data-packagedElement-58" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-58-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-packagedElement-58-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-58-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -13664,12 +13705,12 @@ DataInput owned by BPMN Activity has no notation. </body>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataAssociation-targetRef" name="targetRef" visibility="public" type="BPMNProfile-Process-Data-ItemAwareElement" association="BPMNProfile-Process-Data-packagedElement-48" isderived="false"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataAssociation-transformation" name="transformation" visibility="public" type="BPMNProfile-CoreStructure-Common-FormalExpression" association="BPMNProfile-Process-Data-packagedElement-49" isderived="false"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-DataAssociation-assignment" name="assignment" visibility="public" type="BPMNProfile-Process-Data-Assignment" association="BPMNProfile-Process-Data-packagedElement-41">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-DataAssociation-assignment-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-DataAssociation-assignment-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-DataAssociation-assignment-upperValue" value="*"/>
       </ownedAttribute>
       <icon xmi:type="uml:Image" xmi:id="_VGNukOmcEeSE8qC-7-3YgA" format="Papyrus" location="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataAssociation.png">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Zer4ULJKEeW3evHeiuWSvw" source="image_papyrus">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZetGcLJKEeW3evHeiuWSvw" key="image_kind_key" value="icon"/>
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_P441UIycEeahl9J4idMaeA" source="image_papyrus">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P45cYIycEeahl9J4idMaeA" key="image_kind_key" value="icon"/>
         </eAnnotations>
         <content xsi:nil="true"/>
       </icon>
@@ -13682,7 +13723,7 @@ DataInput owned by BPMN Activity has no notation. </body>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-Process-Data-packagedElement-45" memberEnd="BPMNProfile-Process-Data-packagedElement-45-ownedEnd BPMNProfile-Process-Data-InputOutputBinding-operationRef">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Data-packagedElement-45-ownedEnd" name="ioBinding" visibility="public" type="BPMNProfile-Process-Data-InputOutputBinding" association="BPMNProfile-Process-Data-packagedElement-45" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-45-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Data-packagedElement-45-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Data-packagedElement-45-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -13721,7 +13762,7 @@ DataInput owned by BPMN Activity has no notation. </body>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="BPMNProfile-Process-HumanInteraction-UserTask-implementation-defaultValue" value="##unspecified"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-HumanInteraction-UserTask-renderings" name="renderings" visibility="public" type="BPMNProfile-Process-HumanInteraction-Rendering" association="BPMNProfile-Process-HumanInteraction-packagedElement-14" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-HumanInteraction-UserTask-renderings-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-HumanInteraction-UserTask-renderings-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-HumanInteraction-UserTask-renderings-upperValue" value="*"/>
       </ownedAttribute>
       <icon xmi:type="uml:Image" xmi:id="_EpYSsHRXEeW1y_LdWwRLJQ" format="Papyrus" location="platform:/plugin/org.eclipse.papyrus.bpmn/icons/UserTask.png">
@@ -13754,12 +13795,12 @@ DataInput owned by BPMN Activity has no notation. </body>
       <generalization xmi:type="uml:Generalization" xmi:id="BPMNProfile-Process-HumanInteraction-GlobalUserTask-generalization" general="BPMNProfile-Process-GlobalTask"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-HumanInteraction-GlobalUserTask-implementation" name="implementation" visibility="public" isOrdered="true" isUnique="false" association="BPMNProfile-Process-HumanInteraction-packagedElement-11" isderived="false">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-HumanInteraction-GlobalUserTask-implementation-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-HumanInteraction-GlobalUserTask-implementation-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-HumanInteraction-GlobalUserTask-implementation-upperValue" value="*"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="BPMNProfile-Process-HumanInteraction-GlobalUserTask-implementation-defaultValue" value="##unspecified"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-HumanInteraction-GlobalUserTask-renderings" name="renderings" visibility="public" type="BPMNProfile-Process-HumanInteraction-Rendering" association="BPMNProfile-Process-HumanInteraction-packagedElement-12" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-HumanInteraction-GlobalUserTask-renderings-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-HumanInteraction-GlobalUserTask-renderings-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-HumanInteraction-GlobalUserTask-renderings-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -13800,7 +13841,7 @@ DataInput owned by BPMN Activity has no notation. </body>
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-InteractionNode-outgoingConversationLinks" name="outgoingConversationLinks" visibility="public" type="BPMNProfile-Collaboration-Conversation-ConversationLink" association="BPMNProfile-Collaboration-Conversation-packagedElement-16" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-InteractionNode-outgoingConversationLinks-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-InteractionNode-outgoingConversationLinks-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-InteractionNode-outgoingConversationLinks-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-InteractionNode-incomingConversationLinks" name="incomingConversationLinks" visibility="public" type="BPMNProfile-Collaboration-Conversation-ConversationLink" association="BPMNProfile-Collaboration-Conversation-packagedElement-17" isderived="false"/>
@@ -13881,15 +13922,15 @@ DataInput owned by BPMN Activity has no notation. </body>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-Participant-participantMultiplicity_-lowerValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-Participant-partnerEntityRef" name="partnerEntityRef" visibility="public" type="BPMNProfile-Collaboration-PartnerEntity" association="BPMNProfile-Collaboration-packagedElement-34" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Participant-partnerEntityRef-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-Participant-partnerEntityRef-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Participant-partnerEntityRef-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-Participant-partnerRoleRef" name="partnerRoleRef" visibility="public" type="BPMNProfile-Collaboration-PartnerRole" association="BPMNProfile-Collaboration-packagedElement-35" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Participant-partnerRoleRef-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-Participant-partnerRoleRef-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Participant-partnerRoleRef-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-Participant-interfaceRefs" name="interfaceRefs" visibility="public" type="BPMNProfile-CoreStructure-Service-BPMNInterface" association="BPMNProfile-Collaboration-packagedElement-40" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Participant-interfaceRefs-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-Participant-interfaceRefs-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Participant-interfaceRefs-upperValue" value="*"/>
       </ownedAttribute>
       <icon xmi:type="uml:Image" xmi:id="_1DI-MOmcEeSE8qC-7-3YgA" format="Papyrus" location="platform:/plugin/org.eclipse.papyrus.bpmn/icons/Participant.png">
@@ -13935,7 +13976,7 @@ DataInput owned by BPMN Activity has no notation. </body>
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-PartnerRole-participantRef" name="participantRef" visibility="public" type="BPMNProfile-Collaboration-Participant" association="BPMNProfile-Collaboration-packagedElement-35" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-PartnerRole-participantRef-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-PartnerRole-participantRef-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-PartnerRole-participantRef-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -13989,34 +14030,34 @@ DataInput owned by BPMN Activity has no notation. </body>
         <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-isClosed-defaultValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-participantAssociations" name="participantAssociations" visibility="public" type="BPMNProfile-Collaboration-ParticipantAssociation" association="BPMNProfile-Collaboration-packagedElement-6">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-participantAssociations-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-participantAssociations-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-participantAssociations-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-messageFlowAssociations" name="messageFlowAssociations" visibility="public" type="BPMNProfile-Collaboration-MessageFlowAssociation" association="BPMNProfile-Collaboration-packagedElement-3">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-messageFlowAssociations-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-messageFlowAssociations-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-messageFlowAssociations-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-messageFlows" name="messageFlows" visibility="public" type="BPMNProfile-Collaboration-MessageFlow" association="BPMNProfile-Collaboration-packagedElement-19">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-messageFlows-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-messageFlows-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-messageFlows-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-base_Collaboration" name="base_Collaboration" visibility="public" association="BPMNProfile-Collaboration-packagedElement-2">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Collaboration"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-conversations" name="conversations" visibility="public" type="BPMNProfile-Collaboration-Conversation-ConversationNode" association="BPMNProfile-Collaboration-packagedElement-9">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-conversations-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-conversations-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-conversations-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-correlationKeys" name="correlationKeys" visibility="public" type="BPMNProfile-CoreStructure-Common-CorrelationKey" association="BPMNProfile-Collaboration-packagedElement-12">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-correlationKeys-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-correlationKeys-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-correlationKeys-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-participants" name="participants" visibility="public" type="BPMNProfile-Collaboration-Participant" association="BPMNProfile-Collaboration-packagedElement-25" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-participants-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-participants-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-participants-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-conversationLinks" name="conversationLinks" visibility="public" type="BPMNProfile-Collaboration-Conversation-ConversationLink" association="BPMNProfile-Collaboration-packagedElement-26" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-conversationLinks-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-conversationLinks-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-BPMNCollaboration-conversationLinks-upperValue" value="*"/>
       </ownedAttribute>
       <icon xmi:type="uml:Image" xmi:id="_Fy5zwLJWEeW3evHeiuWSvw" location="platform:/plugin/org.eclipse.papyrus.bpmn/icons/Collaboration.png">
@@ -14054,7 +14095,7 @@ DataInput owned by BPMN Activity has no notation. </body>
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-PartnerEntity-participantRef" name="participantRef" visibility="public" type="BPMNProfile-Collaboration-Participant" association="BPMNProfile-Collaboration-packagedElement-34" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-PartnerEntity-participantRef-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-PartnerEntity-participantRef-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-PartnerEntity-participantRef-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -14176,7 +14217,7 @@ DataInput owned by BPMN Activity has no notation. </body>
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Stereotype"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Foundation-ExtensionDefinition-extensionAttributeDefinitions" name="extensionAttributeDefinitions" visibility="public" type="BPMNProfile-CoreStructure-Foundation-ExtensionAttributeDefinition" association="BPMNProfile-CoreStructure-Foundation-packagedElement-24" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Foundation-ExtensionDefinition-extensionAttributeDefinitions-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Foundation-ExtensionDefinition-extensionAttributeDefinitions-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Foundation-ExtensionDefinition-extensionAttributeDefinitions-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -14224,7 +14265,7 @@ DataInput owned by BPMN Activity has no notation. </body>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-id-lowerValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-extensionValues" name="extensionValues" visibility="public" type="BPMNProfile-CoreStructure-Foundation-ExtensionAttributeValue" association="BPMNProfile-CoreStructure-Foundation-packagedElement-3">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-extensionValues-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-extensionValues-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-extensionValues-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-base_Element" name="base_Element" visibility="public" association="BPMNProfile-CoreStructure-Foundation-packagedElement-2">
@@ -14235,15 +14276,15 @@ DataInput owned by BPMN Activity has no notation. </body>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-documentation-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-extensionDefinitions" name="extensionDefinitions" visibility="public" type="BPMNProfile-CoreStructure-Foundation-ExtensionDefinition" association="BPMNProfile-CoreStructure-Foundation-packagedElement-21" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-extensionDefinitions-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-extensionDefinitions-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-extensionDefinitions-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-outgoing" name="outgoing" visibility="public" type="BPMNProfile-CoreStructure-Common-Artifacts-BPMNAssociation" association="BPMNProfile-CoreStructure-Common-Artifacts-packagedElement-15" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-outgoing-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-outgoing-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-outgoing-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-incoming" name="incoming" visibility="public" type="BPMNProfile-CoreStructure-Common-Artifacts-BPMNAssociation" association="BPMNProfile-CoreStructure-Common-Artifacts-packagedElement-16" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-incoming-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-incoming-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Foundation-BaseElement-incoming-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -14287,7 +14328,7 @@ DataInput owned by BPMN Activity has no notation. </body>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-CoreStructure-Foundation-packagedElement-14" memberEnd="BPMNProfile-CoreStructure-Foundation-packagedElement-14-ownedEnd BPMNProfile-CoreStructure-Foundation-ExtensionAttributeValue-valueRef">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Foundation-packagedElement-14-ownedEnd" visibility="public" type="BPMNProfile-CoreStructure-Foundation-ExtensionAttributeValue" association="BPMNProfile-CoreStructure-Foundation-packagedElement-14">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Foundation-packagedElement-14-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Foundation-packagedElement-14-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Foundation-packagedElement-14-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -14371,7 +14412,7 @@ DataInput owned by BPMN Activity has no notation. </body>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Service-BPMNOperation-outMessageRef-lowerValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Service-BPMNOperation-errorRef" name="errorRef" visibility="public" type="BPMNProfile-CoreStructure-Common-Events-Error" association="BPMNProfile-CoreStructure-Service-packagedElement-8" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Service-BPMNOperation-errorRef-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Service-BPMNOperation-errorRef-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Service-BPMNOperation-errorRef-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -14423,11 +14464,11 @@ DataInput owned by BPMN Activity has no notation. </body>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Service-BPMNInterface-implementationRef-lowerValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Service-BPMNInterface-operations" name="operations" visibility="public" type="BPMNProfile-CoreStructure-Service-BPMNOperation" association="BPMNProfile-CoreStructure-Service-packagedElement-5" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Service-BPMNInterface-operations-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Service-BPMNInterface-operations-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Service-BPMNInterface-operations-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-CoreStructure-Service-BPMNInterface-callableElements" name="callableElements" visibility="public" type="BPMNProfile-CoreStructure-Common-CallableElement" association="BPMNProfile-CoreStructure-Service-packagedElement-9" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Service-BPMNInterface-callableElements-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-CoreStructure-Service-BPMNInterface-callableElements-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-CoreStructure-Service-BPMNInterface-callableElements-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -14445,7 +14486,7 @@ DataInput owned by BPMN Activity has no notation. </body>
       </ownedRule>
       <generalization xmi:type="uml:Generalization" xmi:id="BPMNProfile-Collaboration-Conversation-SubConversation-generalization" general="BPMNProfile-Collaboration-Conversation-ConversationNode"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-Conversation-SubConversation-conversationNodes" name="conversationNodes" visibility="public" type="BPMNProfile-Collaboration-Conversation-ConversationNode" association="BPMNProfile-Collaboration-Conversation-packagedElement-5">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Conversation-SubConversation-conversationNodes-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-Conversation-SubConversation-conversationNodes-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Conversation-SubConversation-conversationNodes-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -14454,7 +14495,7 @@ DataInput owned by BPMN Activity has no notation. </body>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-Collaboration-Conversation-packagedElement-8" memberEnd="BPMNProfile-Collaboration-Conversation-packagedElement-8-ownedEnd BPMNProfile-Collaboration-Conversation-ConversationNode-messageFlowRefs">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-Conversation-packagedElement-8-ownedEnd" visibility="public" type="BPMNProfile-Collaboration-Conversation-ConversationNode" association="BPMNProfile-Collaboration-Conversation-packagedElement-8">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Conversation-packagedElement-8-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-Conversation-packagedElement-8-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Conversation-packagedElement-8-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -14475,11 +14516,11 @@ DataInput owned by BPMN Activity has no notation. </body>
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InformationFlow"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-Conversation-ConversationNode-messageFlowRefs" name="messageFlowRefs" visibility="public" type="BPMNProfile-Collaboration-MessageFlow" association="BPMNProfile-Collaboration-Conversation-packagedElement-8">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Conversation-ConversationNode-messageFlowRefs-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-Conversation-ConversationNode-messageFlowRefs-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Conversation-ConversationNode-messageFlowRefs-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-Conversation-ConversationNode-correlationKeys" name="correlationKeys" visibility="public" type="BPMNProfile-CoreStructure-Common-CorrelationKey" association="BPMNProfile-Collaboration-Conversation-packagedElement-9">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Conversation-ConversationNode-correlationKeys-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-Conversation-ConversationNode-correlationKeys-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Conversation-ConversationNode-correlationKeys-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-Conversation-ConversationNode-participantRefs" name="participantRefs" visibility="public" type="BPMNProfile-Collaboration-Participant" association="BPMNProfile-Collaboration-Conversation-packagedElement-13" isderived="false">
@@ -14525,7 +14566,7 @@ DataInput owned by BPMN Activity has no notation. </body>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-Conversation-CallConversation-calledCollaborationRef-lowerValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Collaboration-Conversation-CallConversation-participantAssociations" name="participantAssociations" visibility="public" type="BPMNProfile-Collaboration-ParticipantAssociation" association="BPMNProfile-Collaboration-Conversation-packagedElement-15" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Conversation-CallConversation-participantAssociations-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Collaboration-Conversation-CallConversation-participantAssociations-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Collaboration-Conversation-CallConversation-participantAssociations-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -14592,7 +14633,7 @@ DataInput owned by BPMN Activity has no notation. </body>
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#StructuredActivityNode"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-SubProcess-hasLaneSets" name="hasLaneSets" visibility="public" type="BPMNProfile-Process-LaneSet" association="BPMNProfile-Process-Activities-packagedElement-34">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-SubProcess-hasLaneSets-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-SubProcess-hasLaneSets-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-SubProcess-hasLaneSets-upperValue" value="*"/>
       </ownedAttribute>
       <icon xmi:type="uml:Image" xmi:id="_CeMOEOmdEeSE8qC-7-3YgA" format="Papyrus" location="platform:/plugin/org.eclipse.papyrus.bpmn/icons/SubProcess.png">
@@ -14682,29 +14723,29 @@ DataInput owned by BPMN Activity has no notation. </body>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-activityClass-lowerValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-properties" name="properties" visibility="public" type="BPMNProfile-Process-Data-BPMNProperty" association="BPMNProfile-Process-Activities-packagedElement-42" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-properties-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-properties-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-properties-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-default" name="default" visibility="public" type="BPMNProfile-CoreStructure-Common-SequenceFlow" association="BPMNProfile-Process-Activities-packagedElement-43" isderived="false">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-default-lowerValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-boundaryEventRefs" name="boundaryEventRefs" visibility="public" type="BPMNProfile-CoreStructure-Common-Events-BoundaryEvent" association="BPMNProfile-Process-Activities-packagedElement-48" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-boundaryEventRefs-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-boundaryEventRefs-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-boundaryEventRefs-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-dataInputAssociations" name="dataInputAssociations" visibility="public" type="BPMNProfile-Process-Data-DataInputAssociation" association="BPMNProfile-Process-Activities-packagedElement-49" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-dataInputAssociations-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-dataInputAssociations-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-dataInputAssociations-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-dataOutputAssociations" name="dataOutputAssociations" visibility="public" type="BPMNProfile-Process-Data-DataOutputAssociation" association="BPMNProfile-Process-Activities-packagedElement-50" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-dataOutputAssociations-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-dataOutputAssociations-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-dataOutputAssociations-upperValue" value="*"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-loopCharacteristics" name="loopCharacteristics" visibility="public" type="BPMNProfile-Process-Activities-LoopCharacteristics" association="BPMNProfile-Process-Activities-packagedElement-52" isderived="false">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-loopCharacteristics-lowerValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-resources" name="resources" visibility="public" type="BPMNProfile-Process-Activities-ResourceRole" association="BPMNProfile-Process-Activities-packagedElement-65" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-resources-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-resources-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-BPMNActivity-resources-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -14722,7 +14763,7 @@ DataInput owned by BPMN Activity has no notation. </body>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-Process-Activities-packagedElement-3" memberEnd="BPMNProfile-Process-Activities-packagedElement-3-ownedEnd BPMNProfile-Process-Activities-ReceiveTask-messageRef">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-packagedElement-3-ownedEnd" visibility="public" type="BPMNProfile-Process-Activities-ReceiveTask" association="BPMNProfile-Process-Activities-packagedElement-3">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-packagedElement-3-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-packagedElement-3-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-packagedElement-3-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -14763,7 +14804,7 @@ DataInput owned by BPMN Activity has no notation. </body>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-CallActivity-base_CallBehaviorAction" name="base_CallBehaviorAction" visibility="public" association="BPMNProfile-Process-Activities-packagedElement-11">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#CallBehaviorAction"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-CallActivity-calledElementRef" name="calledElementRef" visibility="public" type="BPMNProfile-CoreStructure-Common-CallableElement" association="BPMNProfile-Process-Activities-packagedElement-44" isderived="false">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-CallActivity-calledElementRef" name="calledElementRef" visibility="public" type="BPMNProfile-CoreStructure-Common-CallableElement" isReadOnly="true" isDerived="true" association="BPMNProfile-Process-Activities-packagedElement-44" isderived="false">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-CallActivity-calledElementRef-lowerValue"/>
       </ownedAttribute>
       <icon xmi:type="uml:Image" xmi:id="_lW8HwIybEeahl9J4idMaeA" format="Papyrus" location="platform:/plugin/org.eclipse.papyrus.bpmn/icons/CallActivity.png">
@@ -14821,7 +14862,7 @@ DataInput owned by BPMN Activity has no notation. </body>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-ResourceRole-resourceRef-lowerValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-ResourceRole-resourceParameterBindings_" name="resourceParameterBindings " visibility="public" type="BPMNProfile-Process-Activities-ResourceParameterBinding" association="BPMNProfile-Process-Activities-packagedElement-69" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-ResourceRole-resourceParameterBindings_-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-ResourceRole-resourceParameterBindings_-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-ResourceRole-resourceParameterBindings_-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
@@ -14832,7 +14873,7 @@ DataInput owned by BPMN Activity has no notation. </body>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="BPMNProfile-Process-Activities-packagedElement-12" memberEnd="BPMNProfile-Process-Activities-packagedElement-12-ownedEnd BPMNProfile-Process-Activities-SendTask-messageRef">
       <ownedEnd xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-packagedElement-12-ownedEnd" visibility="public" type="BPMNProfile-Process-Activities-SendTask" association="BPMNProfile-Process-Activities-packagedElement-12">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-packagedElement-12-ownedEnd-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-packagedElement-12-ownedEnd-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-packagedElement-12-ownedEnd-upperValue" value="*"/>
       </ownedEnd>
     </packagedElement>
@@ -15050,10 +15091,10 @@ DataInput owned by BPMN Activity has no notation. </body>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-StandardLoopCharacteristics-base_LoopNode" name="base_LoopNode" visibility="public" association="BPMNProfile-Process-Activities-packagedElement-2">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#LoopNode"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-StandardLoopCharacteristics-testBefore" name="testBefore" visibility="public" association="BPMNProfile-Process-Activities-packagedElement-53" isderived="false">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-StandardLoopCharacteristics-testBefore" name="testBefore" visibility="public" isReadOnly="true" isDerived="true" association="BPMNProfile-Process-Activities-packagedElement-53" isderived="false">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-StandardLoopCharacteristics-loopCondition" name="loopCondition" visibility="public" type="BPMNProfile-CoreStructure-Common-BPMNExpression" association="BPMNProfile-Process-Activities-packagedElement-54" isderived="false"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-StandardLoopCharacteristics-loopCondition" name="loopCondition" visibility="public" type="BPMNProfile-CoreStructure-Common-BPMNExpression" isReadOnly="true" isDerived="true" association="BPMNProfile-Process-Activities-packagedElement-54" isderived="false"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Extension" xmi:id="BPMNProfile-Process-Activities-packagedElement-18" memberEnd="BPMNProfile-Process-Activities-packagedElement-18-ownedEnd BPMNProfile-Process-Activities-ServiceTask-base_CallOperationAction" navigableOwnedEnd="BPMNProfile-Process-Activities-packagedElement-18-ownedEnd">
       <generalization xmi:type="uml:Generalization" xmi:id="BPMNProfile-Process-Activities-packagedElement-18-generalization" general="BPMNProfile-Process-Activities-packagedElement-29"/>
@@ -15225,7 +15266,7 @@ DataInput owned by BPMN Activity has no notation. </body>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-MultiInstanceLoopCharacteristics-noneBehaviorEventRef-lowerValue"/>
       </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="BPMNProfile-Process-Activities-MultiInstanceLoopCharacteristics-complexBehaviorDefinition" name="complexBehaviorDefinition" visibility="public" type="BPMNProfile-Process-Activities-ComplexBehaviorDefinition" association="BPMNProfile-Process-Activities-packagedElement-62" isderived="false">
-        <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-MultiInstanceLoopCharacteristics-complexBehaviorDefinition-lowerValue"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="BPMNProfile-Process-Activities-MultiInstanceLoopCharacteristics-complexBehaviorDefinition-lowerValue"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="BPMNProfile-Process-Activities-MultiInstanceLoopCharacteristics-complexBehaviorDefinition-upperValue" value="*"/>
       </ownedAttribute>
     </packagedElement>
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/pom.xml b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/pom.xml
index 1c0617fa0b8..bc8bd599a58 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/pom.xml
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/pom.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>3.0.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.bpmn</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>0.7.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>3.0.0-SNAPSHOT</version>
+		<relativePath>../../../releng/extra</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.bpmn</artifactId>
+	<groupId>org.eclipse.papyrus</groupId>
+	<version>0.8.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
 </project>
 \ No newline at end of file
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/resources/log4j.properties b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/resources/log4j.properties
new file mode 100644
index 00000000000..78bb39a00cb
--- /dev/null
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/resources/log4j.properties
@@ -0,0 +1,11 @@
+# Root logger option
+log4j.rootLogger=ERROR, stdout
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %C.%M(%F:%L) : %m%n
+
+# apparently there is a logger for org.eclipse somewhere with WARN level
+log4j.logger.org.eclipse.papyrus.bpmn=WARN
+\ No newline at end of file
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/Activator.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/Activator.java
index dbfd73ec9fc..da6594b3f92 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/Activator.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/Activator.java
@@ -11,6 +11,13 @@
  *****************************************************************************/
 package org.eclipse.papyrus.bpmn;
 
+import java.io.IOException;
+import java.net.URL;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
@@ -25,6 +32,8 @@ public class Activator extends AbstractUIPlugin {
 	// The shared instance
 	private static Activator plugin;
 	
+	final private static Logger log = Logger.getLogger(Activator.class);
+	
 	/**
 	 * The constructor
 	 */
@@ -38,6 +47,18 @@ public class Activator extends AbstractUIPlugin {
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
+		
+        URL confURL = getBundle().getEntry("resources/log4j.properties");
+
+		try {
+        	String file = FileLocator.toFileURL(confURL).getFile();
+        	PropertyConfigurator.configure(file);
+        }
+        catch(IOException e) {
+        	System.err.println(e.getMessage());
+        }
+
+        log.info("Logging using log4j (" + FileLocator.toFileURL(confURL).getFile()+")");
 	}
 
 	/*
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNActivity.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNActivity.java
index 4ec7eb34707..dda361f0df6 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNActivity.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNActivity.java
@@ -180,7 +180,7 @@ public interface BPMNActivity extends FlowNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Properties</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNActivity_Properties()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<BPMNProperty> getProperties();
@@ -222,7 +222,7 @@ public interface BPMNActivity extends FlowNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Boundary Event Refs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNActivity_BoundaryEventRefs()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<BoundaryEvent> getBoundaryEventRefs();
@@ -238,7 +238,7 @@ public interface BPMNActivity extends FlowNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Data Input Associations</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNActivity_DataInputAssociations()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<DataInputAssociation> getDataInputAssociations();
@@ -254,7 +254,7 @@ public interface BPMNActivity extends FlowNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Data Output Associations</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNActivity_DataOutputAssociations()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<DataOutputAssociation> getDataOutputAssociations();
@@ -296,7 +296,7 @@ public interface BPMNActivity extends FlowNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Resources</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNActivity_Resources()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<ResourceRole> getResources();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNCollaboration.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNCollaboration.java
index 9ee3da85088..48a5eb15cf2 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNCollaboration.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNCollaboration.java
@@ -71,7 +71,7 @@ public interface BPMNCollaboration extends RootElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Participant Associations</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNCollaboration_ParticipantAssociations()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<ParticipantAssociation> getParticipantAssociations();
@@ -89,7 +89,7 @@ public interface BPMNCollaboration extends RootElement {
 	 * @return the value of the '<em>Conversation Links</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNCollaboration_ConversationLinks()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.ConversationLink#getCollaboration
-	 * @model opposite="collaboration" required="true" ordered="false"
+	 * @model opposite="collaboration" ordered="false"
 	 * @generated
 	 */
 	EList<ConversationLink> getConversationLinks();
@@ -105,7 +105,7 @@ public interface BPMNCollaboration extends RootElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Message Flow Associations</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNCollaboration_MessageFlowAssociations()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<MessageFlowAssociation> getMessageFlowAssociations();
@@ -121,7 +121,7 @@ public interface BPMNCollaboration extends RootElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Message Flows</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNCollaboration_MessageFlows()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<MessageFlow> getMessageFlows();
@@ -163,7 +163,7 @@ public interface BPMNCollaboration extends RootElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Conversations</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNCollaboration_Conversations()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<ConversationNode> getConversations();
@@ -179,7 +179,7 @@ public interface BPMNCollaboration extends RootElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Correlation Keys</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNCollaboration_CorrelationKeys()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<CorrelationKey> getCorrelationKeys();
@@ -195,7 +195,7 @@ public interface BPMNCollaboration extends RootElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Participants</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNCollaboration_Participants()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<Participant> getParticipants();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNEvent.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNEvent.java
index 2b38fb94af7..3d820538776 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNEvent.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNEvent.java
@@ -61,7 +61,7 @@ public interface BPMNEvent extends FlowNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>event Definitions</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNEvent__eventDefinitions()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName=' eventDefinitions'"
 	 * @generated
 	 */
@@ -78,7 +78,7 @@ public interface BPMNEvent extends FlowNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Properties</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNEvent_Properties()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<BPMNProperty> getProperties();
@@ -94,7 +94,7 @@ public interface BPMNEvent extends FlowNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Event Definition Refs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNEvent_EventDefinitionRefs()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<EventDefinition> getEventDefinitionRefs();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNExpression.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNExpression.java
index b576bc2f3c0..366193b9164 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNExpression.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNExpression.java
@@ -32,7 +32,7 @@ public interface BPMNExpression extends BaseElement {
 	 * @return the value of the '<em>Base Opaque Expression</em>' reference.
 	 * @see #setBase_OpaqueExpression(OpaqueExpression)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNExpression_Base_OpaqueExpression()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	OpaqueExpression getBase_OpaqueExpression();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNInterface.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNInterface.java
index 758b48fe5ea..eaeb2cb94fd 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNInterface.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNInterface.java
@@ -92,7 +92,7 @@ public interface BPMNInterface extends RootElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Operations</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNInterface_Operations()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<BPMNOperation> getOperations();
@@ -108,7 +108,7 @@ public interface BPMNInterface extends RootElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Callable Elements</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNInterface_CallableElements()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<CallableElement> getCallableElements();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNOperation.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNOperation.java
index 75471660e84..24bf72aed9a 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNOperation.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNOperation.java
@@ -145,7 +145,7 @@ public interface BPMNOperation extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Error Ref</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNOperation_ErrorRef()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<org.eclipse.papyrus.bpmn.BPMNProfile.Error> getErrorRef();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNProcess.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNProcess.java
index 64c887b4df9..851e738e477 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNProcess.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BPMNProcess.java
@@ -207,7 +207,7 @@ public interface BPMNProcess extends CallableElement, FlowElementsContainer {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Correlation Subscriptions</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNProcess_CorrelationSubscriptions()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<CorrelationSubscription> getCorrelationSubscriptions();
@@ -247,24 +247,13 @@ public interface BPMNProcess extends CallableElement, FlowElementsContainer {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Supports</em>' reference.
-	 * @see #setSupports(BPMNProcess)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNProcess_Supports()
-	 * @model required="true" ordered="false"
+	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
 	 * @generated
 	 */
 	BPMNProcess getSupports();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProcess#getSupports <em>Supports</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Supports</em>' reference.
-	 * @see #getSupports()
-	 * @generated
-	 */
-	void setSupports(BPMNProcess value);
-
-	/**
 	 * Returns the value of the '<em><b>Properties</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProperty}.
 	 * <!-- begin-user-doc -->
@@ -275,7 +264,7 @@ public interface BPMNProcess extends CallableElement, FlowElementsContainer {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Properties</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNProcess_Properties()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<BPMNProperty> getProperties();
@@ -293,7 +282,7 @@ public interface BPMNProcess extends CallableElement, FlowElementsContainer {
 	 * @return the value of the '<em>Resources</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBPMNProcess_Resources()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.ResourceRole#getProcess
-	 * @model opposite="process" required="true" ordered="false"
+	 * @model opposite="process" ordered="false"
 	 * @generated
 	 */
 	EList<ResourceRole> getResources();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BaseElement.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BaseElement.java
index 66d3a7fe4d4..6e7888a0425 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BaseElement.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BaseElement.java
@@ -66,7 +66,7 @@ public interface BaseElement extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Extension Values</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBaseElement_ExtensionValues()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<ExtensionAttributeValue> getExtensionValues();
@@ -108,7 +108,7 @@ public interface BaseElement extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Documentation</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBaseElement_Documentation()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<Documentation> getDocumentation();
@@ -124,7 +124,7 @@ public interface BaseElement extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Extension Definitions</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBaseElement_ExtensionDefinitions()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<ExtensionDefinition> getExtensionDefinitions();
@@ -142,7 +142,7 @@ public interface BaseElement extends EObject {
 	 * @return the value of the '<em>Outgoing</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBaseElement_Outgoing()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNAssociation#getSourceRef
-	 * @model opposite="sourceRef" required="true" ordered="false"
+	 * @model opposite="sourceRef" ordered="false"
 	 * @generated
 	 */
 	EList<BPMNAssociation> getOutgoing();
@@ -160,7 +160,7 @@ public interface BaseElement extends EObject {
 	 * @return the value of the '<em>Incoming</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBaseElement_Incoming()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNAssociation#getTargetRef
-	 * @model opposite="targetRef" required="true" ordered="false"
+	 * @model opposite="targetRef" ordered="false"
 	 * @generated
 	 */
 	EList<BPMNAssociation> getIncoming();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BoundaryEvent.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BoundaryEvent.java
index 1159ff9fd44..6fb6e901161 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BoundaryEvent.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/BoundaryEvent.java
@@ -59,24 +59,13 @@ public interface BoundaryEvent extends CatchEvent {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Attached To Ref</em>' reference.
-	 * @see #setAttachedToRef(BPMNActivity)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getBoundaryEvent_AttachedToRef()
-	 * @model required="true" ordered="false"
+	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
 	 * @generated
 	 */
 	BPMNActivity getAttachedToRef();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.bpmn.BPMNProfile.BoundaryEvent#getAttachedToRef <em>Attached To Ref</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attached To Ref</em>' reference.
-	 * @see #getAttachedToRef()
-	 * @generated
-	 */
-	void setAttachedToRef(BPMNActivity value);
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CallActivity.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CallActivity.java
index 7a8027393c1..062877487f6 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CallActivity.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CallActivity.java
@@ -60,24 +60,13 @@ public interface CallActivity extends BPMNActivity {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Called Element Ref</em>' reference.
-	 * @see #setCalledElementRef(CallableElement)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getCallActivity_CalledElementRef()
-	 * @model ordered="false"
+	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
 	 * @generated
 	 */
 	CallableElement getCalledElementRef();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.bpmn.BPMNProfile.CallActivity#getCalledElementRef <em>Called Element Ref</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Called Element Ref</em>' reference.
-	 * @see #getCalledElementRef()
-	 * @generated
-	 */
-	void setCalledElementRef(CallableElement value);
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CallConversation.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CallConversation.java
index 1c117f43875..56b24a4491f 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CallConversation.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CallConversation.java
@@ -91,7 +91,7 @@ public interface CallConversation extends ConversationNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Participant Associations</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getCallConversation_ParticipantAssociations()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<ParticipantAssociation> getParticipantAssociations();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CallableElement.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CallableElement.java
index 5fc78bc1b86..696ff4883cd 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CallableElement.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CallableElement.java
@@ -91,7 +91,7 @@ public interface CallableElement extends RootElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Supported Interface Refs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getCallableElement_SupportedInterfaceRefs()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<BPMNInterface> getSupportedInterfaceRefs();
@@ -107,7 +107,7 @@ public interface CallableElement extends RootElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Io Binding</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getCallableElement_IoBinding()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<InputOutputBinding> getIoBinding();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CatchEvent.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CatchEvent.java
index 8f30bd53063..877a18416c5 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CatchEvent.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CatchEvent.java
@@ -67,7 +67,7 @@ public interface CatchEvent extends BPMNEvent {
 	 * @return the value of the '<em>Base Accept Event Action</em>' reference.
 	 * @see #setBase_AcceptEventAction(AcceptEventAction)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getCatchEvent_Base_AcceptEventAction()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	AcceptEventAction getBase_AcceptEventAction();
@@ -93,7 +93,7 @@ public interface CatchEvent extends BPMNEvent {
 	 * @return the value of the '<em>Base Initial Node</em>' reference.
 	 * @see #setBase_InitialNode(InitialNode)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getCatchEvent_Base_InitialNode()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	InitialNode getBase_InitialNode();
@@ -119,7 +119,7 @@ public interface CatchEvent extends BPMNEvent {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Data Output Association</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getCatchEvent_DataOutputAssociation()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<DataOutputAssociation> getDataOutputAssociation();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Category.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Category.java
index 96546c5b508..b0378075186 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Category.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Category.java
@@ -60,7 +60,7 @@ public interface Category extends RootElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Category Value</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getCategory_CategoryValue()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<CategoryValue> getCategoryValue();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CategoryValue.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CategoryValue.java
index d8625300c0b..e7a098bb305 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CategoryValue.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CategoryValue.java
@@ -62,7 +62,7 @@ public interface CategoryValue extends BaseElement {
 	 * @return the value of the '<em>Categorized Flow Elements</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getCategoryValue_CategorizedFlowElements()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.FlowElement#get_categoryValueRef
-	 * @model opposite="_categoryValueRef" required="true" ordered="false"
+	 * @model opposite="_categoryValueRef" ordered="false"
 	 * @generated
 	 */
 	EList<FlowElement> getCategorizedFlowElements();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ConversationNode.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ConversationNode.java
index 633aafd1f8b..2da0c398338 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ConversationNode.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ConversationNode.java
@@ -65,7 +65,7 @@ public interface ConversationNode extends InteractionNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Message Flow Refs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getConversationNode_MessageFlowRefs()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<MessageFlow> getMessageFlowRefs();
@@ -81,7 +81,7 @@ public interface ConversationNode extends InteractionNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Correlation Keys</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getConversationNode_CorrelationKeys()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<CorrelationKey> getCorrelationKeys();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CorrelationKey.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CorrelationKey.java
index 151e44d2c3a..c8aaa8d8603 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CorrelationKey.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CorrelationKey.java
@@ -59,7 +59,7 @@ public interface CorrelationKey extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Correlation Property Ref</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getCorrelationKey_CorrelationPropertyRef()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<CorrelationProperty> getCorrelationPropertyRef();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CorrelationSubscription.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CorrelationSubscription.java
index 6115fde92ba..118f0dc84ee 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CorrelationSubscription.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/CorrelationSubscription.java
@@ -86,7 +86,7 @@ public interface CorrelationSubscription extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Correlation Property Binding</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getCorrelationSubscription_CorrelationPropertyBinding()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<CorrelationPropertyBinding> getCorrelationPropertyBinding();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/DataAssociation.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/DataAssociation.java
index 105c6fc2bd9..8565d483c49 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/DataAssociation.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/DataAssociation.java
@@ -144,7 +144,7 @@ public interface DataAssociation extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Assignment</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDataAssociation_Assignment()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<Assignment> getAssignment();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/DataInput.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/DataInput.java
index 2196e3fa2e5..e2d0cd02343 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/DataInput.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/DataInput.java
@@ -71,7 +71,7 @@ public interface DataInput extends ItemAwareElement {
 	 * @return the value of the '<em>Base Input Pin</em>' reference.
 	 * @see #setBase_InputPin(InputPin)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDataInput_Base_InputPin()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	InputPin getBase_InputPin();
@@ -97,7 +97,7 @@ public interface DataInput extends ItemAwareElement {
 	 * @return the value of the '<em>Base Parameter</em>' reference.
 	 * @see #setBase_Parameter(Parameter)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDataInput_Base_Parameter()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	Parameter getBase_Parameter();
@@ -123,7 +123,7 @@ public interface DataInput extends ItemAwareElement {
 	 * @return the value of the '<em>Base Activity Parameter Node</em>' reference.
 	 * @see #setBase_ActivityParameterNode(ActivityParameterNode)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDataInput_Base_ActivityParameterNode()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	ActivityParameterNode getBase_ActivityParameterNode();
@@ -151,7 +151,7 @@ public interface DataInput extends ItemAwareElement {
 	 * @return the value of the '<em>Input Set Refs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDataInput_InputSetRefs()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.InputSet#getDataInputRefs
-	 * @model opposite="dataInputRefs" required="true" ordered="false"
+	 * @model opposite="dataInputRefs" ordered="false"
 	 * @generated
 	 */
 	EList<InputSet> getInputSetRefs();
@@ -169,7 +169,7 @@ public interface DataInput extends ItemAwareElement {
 	 * @return the value of the '<em>Input Set With Optional</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDataInput_InputSetWithOptional()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.InputSet#getOptionalInputRefs
-	 * @model opposite="optionalInputRefs" required="true" ordered="false"
+	 * @model opposite="optionalInputRefs" ordered="false"
 	 * @generated
 	 */
 	EList<InputSet> getInputSetWithOptional();
@@ -187,7 +187,7 @@ public interface DataInput extends ItemAwareElement {
 	 * @return the value of the '<em>Input Set With While Executing</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDataInput_InputSetWithWhileExecuting()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.InputSet#getWhileExecutingInputRefs
-	 * @model opposite="whileExecutingInputRefs" required="true" ordered="false"
+	 * @model opposite="whileExecutingInputRefs" ordered="false"
 	 * @generated
 	 */
 	EList<InputSet> getInputSetWithWhileExecuting();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/DataOutput.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/DataOutput.java
index 2271407b184..a41d535386e 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/DataOutput.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/DataOutput.java
@@ -44,7 +44,7 @@ public interface DataOutput extends ItemAwareElement {
 	 * @return the value of the '<em>Base Output Pin</em>' reference.
 	 * @see #setBase_OutputPin(OutputPin)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDataOutput_Base_OutputPin()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	OutputPin getBase_OutputPin();
@@ -97,7 +97,7 @@ public interface DataOutput extends ItemAwareElement {
 	 * @return the value of the '<em>Base Parameter</em>' reference.
 	 * @see #setBase_Parameter(Parameter)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDataOutput_Base_Parameter()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	Parameter getBase_Parameter();
@@ -123,7 +123,7 @@ public interface DataOutput extends ItemAwareElement {
 	 * @return the value of the '<em>Base Activity Parameter Node</em>' reference.
 	 * @see #setBase_ActivityParameterNode(ActivityParameterNode)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDataOutput_Base_ActivityParameterNode()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	ActivityParameterNode getBase_ActivityParameterNode();
@@ -151,7 +151,7 @@ public interface DataOutput extends ItemAwareElement {
 	 * @return the value of the '<em>Output Set Refs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDataOutput_OutputSetRefs()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.OutputSet#getDataOutputRefs
-	 * @model opposite="dataOutputRefs" required="true" ordered="false"
+	 * @model opposite="dataOutputRefs" ordered="false"
 	 * @generated
 	 */
 	EList<OutputSet> getOutputSetRefs();
@@ -167,7 +167,7 @@ public interface DataOutput extends ItemAwareElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Output Set With Optional</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDataOutput_OutputSetWithOptional()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<OutputSet> getOutputSetWithOptional();
@@ -183,7 +183,7 @@ public interface DataOutput extends ItemAwareElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Output Set With While Executing</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDataOutput_OutputSetWithWhileExecuting()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<OutputSet> getOutputSetWithWhileExecuting();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Definitions.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Definitions.java
index 5f1655631f0..406fcf67138 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Definitions.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Definitions.java
@@ -197,7 +197,7 @@ public interface Definitions extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Extensions</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDefinitions_Extensions()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<BPMNExtension> getExtensions();
@@ -213,7 +213,7 @@ public interface Definitions extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Imports</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDefinitions_Imports()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<Import> getImports();
@@ -229,7 +229,7 @@ public interface Definitions extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Relationships</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDefinitions_Relationships()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<BPMNRelationship> getRelationships();
@@ -247,7 +247,7 @@ public interface Definitions extends BaseElement {
 	 * @return the value of the '<em>Root Elements</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getDefinitions_RootElements()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.RootElement#getDefinition
-	 * @model opposite="definition" required="true" ordered="false"
+	 * @model opposite="definition" ordered="false"
 	 * @generated
 	 */
 	EList<RootElement> getRootElements();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ExclusiveGateway.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ExclusiveGateway.java
index b42e18fe0c8..e5b119d61b0 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ExclusiveGateway.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ExclusiveGateway.java
@@ -38,7 +38,7 @@ public interface ExclusiveGateway extends Gateway {
 	 * @return the value of the '<em>Base Decision Node</em>' reference.
 	 * @see #setBase_DecisionNode(DecisionNode)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getExclusiveGateway_Base_DecisionNode()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	DecisionNode getBase_DecisionNode();
@@ -64,7 +64,7 @@ public interface ExclusiveGateway extends Gateway {
 	 * @return the value of the '<em>Base Merge Node</em>' reference.
 	 * @see #setBase_MergeNode(MergeNode)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getExclusiveGateway_Base_MergeNode()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	MergeNode getBase_MergeNode();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ExtensionDefinition.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ExtensionDefinition.java
index 9d72bed34d7..8b937069265 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ExtensionDefinition.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ExtensionDefinition.java
@@ -61,7 +61,7 @@ public interface ExtensionDefinition extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Extension Attribute Definitions</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getExtensionDefinition_ExtensionAttributeDefinitions()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<ExtensionAttributeDefinition> getExtensionAttributeDefinitions();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/FlowElement.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/FlowElement.java
index 156b14b6d1f..49c46fd0a7e 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/FlowElement.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/FlowElement.java
@@ -89,7 +89,7 @@ public interface FlowElement extends BaseElement {
 	 * @return the value of the '<em>category Value Ref</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getFlowElement__categoryValueRef()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.CategoryValue#getCategorizedFlowElements
-	 * @model opposite="categorizedFlowElements" required="true" ordered="false"
+	 * @model opposite="categorizedFlowElements" ordered="false"
 	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName=' categoryValueRef'"
 	 * @generated
 	 */
@@ -105,22 +105,11 @@ public interface FlowElement extends BaseElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Container</em>' reference.
-	 * @see #setContainer(FlowElementsContainer)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getFlowElement_Container()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.FlowElementsContainer#getFlowElements
-	 * @model opposite="flowElements" required="true" ordered="false"
+	 * @model opposite="flowElements" required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
 	 * @generated
 	 */
 	FlowElementsContainer getContainer();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.bpmn.BPMNProfile.FlowElement#getContainer <em>Container</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Container</em>' reference.
-	 * @see #getContainer()
-	 * @generated
-	 */
-	void setContainer(FlowElementsContainer value);
-
 } // FlowElement
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/FlowElementsContainer.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/FlowElementsContainer.java
index cfc5da74d20..1847c6029e8 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/FlowElementsContainer.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/FlowElementsContainer.java
@@ -35,7 +35,7 @@ public interface FlowElementsContainer extends BaseElement {
 	 * @return the value of the '<em>Lane Sets</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getFlowElementsContainer_LaneSets()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.LaneSet#getFlowElementsContainer
-	 * @model opposite="flowElementsContainer" required="true" ordered="false"
+	 * @model opposite="flowElementsContainer" ordered="false"
 	 * @generated
 	 */
 	EList<LaneSet> getLaneSets();
@@ -53,7 +53,7 @@ public interface FlowElementsContainer extends BaseElement {
 	 * @return the value of the '<em>Flow Elements</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getFlowElementsContainer_FlowElements()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.FlowElement#getContainer
-	 * @model opposite="container" required="true" ordered="false"
+	 * @model opposite="container" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
 	 * @generated
 	 */
 	EList<FlowElement> getFlowElements();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/FlowNode.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/FlowNode.java
index 17fe2441e93..6273673e2db 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/FlowNode.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/FlowNode.java
@@ -32,7 +32,7 @@ public interface FlowNode extends FlowElement {
 	 * @return the value of the '<em>Base Activity Node</em>' reference.
 	 * @see #setBase_ActivityNode(ActivityNode)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getFlowNode_Base_ActivityNode()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	ActivityNode getBase_ActivityNode();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Gateway.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Gateway.java
index 2ff1b6ec2fb..34ea66e63aa 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Gateway.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Gateway.java
@@ -60,7 +60,7 @@ public interface Gateway extends FlowNode {
 	 * @return the value of the '<em>Base Activity Group</em>' reference.
 	 * @see #setBase_ActivityGroup(ActivityGroup)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getGateway_Base_ActivityGroup()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	ActivityGroup getBase_ActivityGroup();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalBusinessRuleTask.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalBusinessRuleTask.java
index 9571af49388..f52e577a839 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalBusinessRuleTask.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalBusinessRuleTask.java
@@ -35,7 +35,7 @@ public interface GlobalBusinessRuleTask extends GlobalTask {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Implementation</em>' attribute list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getGlobalBusinessRuleTask_Implementation()
-	 * @model default="##unspecified" unique="false" dataType="org.eclipse.uml2.types.String" required="true"
+	 * @model default="##unspecified" unique="false" dataType="org.eclipse.uml2.types.String"
 	 * @generated
 	 */
 	EList<String> getImplementation();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalScriptTask.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalScriptTask.java
index 1e96e06ffd0..42ce12dd19a 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalScriptTask.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalScriptTask.java
@@ -36,7 +36,7 @@ public interface GlobalScriptTask extends GlobalTask {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Script</em>' attribute list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getGlobalScriptTask_Script()
-	 * @model unique="false" dataType="org.eclipse.uml2.types.String" required="true"
+	 * @model unique="false" dataType="org.eclipse.uml2.types.String"
 	 * @generated
 	 */
 	EList<String> getScript();
@@ -52,7 +52,7 @@ public interface GlobalScriptTask extends GlobalTask {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Script Format</em>' attribute list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getGlobalScriptTask_ScriptFormat()
-	 * @model dataType="org.eclipse.uml2.types.String" required="true"
+	 * @model dataType="org.eclipse.uml2.types.String"
 	 * @generated
 	 */
 	EList<String> getScriptFormat();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalTask.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalTask.java
index 500dec8f158..b09da551a6b 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalTask.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalTask.java
@@ -63,7 +63,7 @@ public interface GlobalTask extends CallableElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Resources</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getGlobalTask_Resources()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<ResourceRole> getResources();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalUserTask.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalUserTask.java
index b9acc2afdaf..1e3ece6db0f 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalUserTask.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/GlobalUserTask.java
@@ -36,7 +36,7 @@ public interface GlobalUserTask extends GlobalTask {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Implementation</em>' attribute list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getGlobalUserTask_Implementation()
-	 * @model default="##unspecified" unique="false" dataType="org.eclipse.uml2.types.String" required="true"
+	 * @model default="##unspecified" unique="false" dataType="org.eclipse.uml2.types.String"
 	 * @generated
 	 */
 	EList<String> getImplementation();
@@ -52,7 +52,7 @@ public interface GlobalUserTask extends GlobalTask {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Renderings</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getGlobalUserTask_Renderings()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<Rendering> getRenderings();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/InputOutputSpecification.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/InputOutputSpecification.java
index a6e0b28c32c..4d2845417b6 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/InputOutputSpecification.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/InputOutputSpecification.java
@@ -91,7 +91,7 @@ public interface InputOutputSpecification extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Data Inputs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getInputOutputSpecification_DataInputs()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<DataInput> getDataInputs();
@@ -107,7 +107,7 @@ public interface InputOutputSpecification extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Data Outputs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getInputOutputSpecification_DataOutputs()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<DataOutput> getDataOutputs();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/InputSet.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/InputSet.java
index 7f6868b429d..6e6e5d46d97 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/InputSet.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/InputSet.java
@@ -67,7 +67,7 @@ public interface InputSet extends BaseElement {
 	 * @return the value of the '<em>Optional Input Refs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getInputSet_OptionalInputRefs()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.DataInput#getInputSetWithOptional
-	 * @model opposite="inputSetWithOptional" required="true" ordered="false"
+	 * @model opposite="inputSetWithOptional" ordered="false"
 	 * @generated
 	 */
 	EList<DataInput> getOptionalInputRefs();
@@ -85,7 +85,7 @@ public interface InputSet extends BaseElement {
 	 * @return the value of the '<em>While Executing Input Refs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getInputSet_WhileExecutingInputRefs()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.DataInput#getInputSetWithWhileExecuting
-	 * @model opposite="inputSetWithWhileExecuting" required="true" ordered="false"
+	 * @model opposite="inputSetWithWhileExecuting" ordered="false"
 	 * @generated
 	 */
 	EList<DataInput> getWhileExecutingInputRefs();
@@ -103,7 +103,7 @@ public interface InputSet extends BaseElement {
 	 * @return the value of the '<em>Data Input Refs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getInputSet_DataInputRefs()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.DataInput#getInputSetRefs
-	 * @model opposite="inputSetRefs" required="true" ordered="false"
+	 * @model opposite="inputSetRefs" ordered="false"
 	 * @generated
 	 */
 	EList<DataInput> getDataInputRefs();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/InteractionNode.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/InteractionNode.java
index 340bbbde12d..4ae12777537 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/InteractionNode.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/InteractionNode.java
@@ -64,7 +64,7 @@ public interface InteractionNode extends EObject {
 	 * @return the value of the '<em>Outgoing Conversation Links</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getInteractionNode_OutgoingConversationLinks()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.ConversationLink#getSourceRef
-	 * @model opposite="sourceRef" required="true" ordered="false"
+	 * @model opposite="sourceRef" ordered="false"
 	 * @generated
 	 */
 	EList<ConversationLink> getOutgoingConversationLinks();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ItemAwareElement.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ItemAwareElement.java
index f5fb21cb0f7..a1ebd0c357c 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ItemAwareElement.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ItemAwareElement.java
@@ -38,7 +38,7 @@ public interface ItemAwareElement extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Data State</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getItemAwareElement_DataState()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<DataState> getDataState();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Lane.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Lane.java
index 9cf22532c49..5c97963fa0e 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Lane.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Lane.java
@@ -95,7 +95,7 @@ public interface Lane extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Flow Node Refs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getLane_FlowNodeRefs()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<FlowNode> getFlowNodeRefs();
@@ -135,25 +135,14 @@ public interface Lane extends BaseElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Child Lane Set</em>' reference.
-	 * @see #setChildLaneSet(LaneSet)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getLane_ChildLaneSet()
-	 * @model required="true" ordered="false"
+	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
 	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='childLaneSet '"
 	 * @generated
 	 */
 	LaneSet getChildLaneSet();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.bpmn.BPMNProfile.Lane#getChildLaneSet <em>Child Lane Set</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Child Lane Set</em>' reference.
-	 * @see #getChildLaneSet()
-	 * @generated
-	 */
-	void setChildLaneSet(LaneSet value);
-
-	/**
 	 * Returns the value of the '<em><b>Lane Set</b></em>' reference.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.bpmn.BPMNProfile.LaneSet#getLanes <em>Lanes</em>}'.
 	 * <!-- begin-user-doc -->
@@ -163,25 +152,14 @@ public interface Lane extends BaseElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Lane Set</em>' reference.
-	 * @see #setLaneSet(LaneSet)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getLane_LaneSet()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.LaneSet#getLanes
-	 * @model opposite="lanes" required="true" ordered="false"
+	 * @model opposite="lanes" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
 	 * @generated
 	 */
 	LaneSet getLaneSet();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.bpmn.BPMNProfile.Lane#getLaneSet <em>Lane Set</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lane Set</em>' reference.
-	 * @see #getLaneSet()
-	 * @generated
-	 */
-	void setLaneSet(LaneSet value);
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/LaneSet.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/LaneSet.java
index c10a172d37d..95c2d0b7ca8 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/LaneSet.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/LaneSet.java
@@ -67,7 +67,7 @@ public interface LaneSet extends BaseElement {
 	 * @return the value of the '<em>Lanes</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getLaneSet_Lanes()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.Lane#getLaneSet
-	 * @model opposite="laneSet" required="true" ordered="false"
+	 * @model opposite="laneSet" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
 	 * @generated
 	 */
 	EList<Lane> getLanes();
@@ -83,7 +83,7 @@ public interface LaneSet extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Parent Lane</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getLaneSet_ParentLane()
-	 * @model required="true" ordered="false"
+	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
 	 * @generated
 	 */
 	EList<Lane> getParentLane();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/LinkEventDefinition.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/LinkEventDefinition.java
index c12f8595e8d..64e5b40683e 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/LinkEventDefinition.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/LinkEventDefinition.java
@@ -66,7 +66,7 @@ public interface LinkEventDefinition extends EventDefinition {
 	 * @return the value of the '<em>Source</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getLinkEventDefinition_Source()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.LinkEventDefinition#get_target
-	 * @model opposite="_target" required="true" ordered="false"
+	 * @model opposite="_target" ordered="false"
 	 * @generated
 	 */
 	EList<LinkEventDefinition> getSource();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/MultiInstanceLoopCharacteristics.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/MultiInstanceLoopCharacteristics.java
index 34347ef0782..ac11c2f52b3 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/MultiInstanceLoopCharacteristics.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/MultiInstanceLoopCharacteristics.java
@@ -337,7 +337,7 @@ public interface MultiInstanceLoopCharacteristics extends LoopCharacteristics {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Complex Behavior Definition</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getMultiInstanceLoopCharacteristics_ComplexBehaviorDefinition()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<ComplexBehaviorDefinition> getComplexBehaviorDefinition();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/NonExclusiveGateway.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/NonExclusiveGateway.java
index b6847d3dad9..7cfd7f77749 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/NonExclusiveGateway.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/NonExclusiveGateway.java
@@ -34,7 +34,7 @@ public interface NonExclusiveGateway extends Gateway {
 	 * @return the value of the '<em>Base Join Node</em>' reference.
 	 * @see #setBase_JoinNode(JoinNode)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getNonExclusiveGateway_Base_JoinNode()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	JoinNode getBase_JoinNode();
@@ -60,7 +60,7 @@ public interface NonExclusiveGateway extends Gateway {
 	 * @return the value of the '<em>Base Fork Node</em>' reference.
 	 * @see #setBase_ForkNode(ForkNode)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getNonExclusiveGateway_Base_ForkNode()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	ForkNode getBase_ForkNode();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/OutputSet.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/OutputSet.java
index 4cb13e5caf6..561f364707c 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/OutputSet.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/OutputSet.java
@@ -65,7 +65,7 @@ public interface OutputSet extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Optional Output Refs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getOutputSet_OptionalOutputRefs()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='optionalOutputRefs '"
 	 * @generated
 	 */
@@ -82,7 +82,7 @@ public interface OutputSet extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>While Executing Output Refs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getOutputSet_WhileExecutingOutputRefs()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='whileExecutingOutputRefs '"
 	 * @generated
 	 */
@@ -101,7 +101,7 @@ public interface OutputSet extends BaseElement {
 	 * @return the value of the '<em>Data Output Refs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getOutputSet_DataOutputRefs()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.DataOutput#getOutputSetRefs
-	 * @model opposite="outputSetRefs" required="true" ordered="false"
+	 * @model opposite="outputSetRefs" ordered="false"
 	 * @generated
 	 */
 	EList<DataOutput> getDataOutputRefs();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Participant.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Participant.java
index b36164e3c6a..82e39141fbc 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Participant.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Participant.java
@@ -122,7 +122,7 @@ public interface Participant extends BaseElement {
 	 * @return the value of the '<em>Partner Entity Ref</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getParticipant_PartnerEntityRef()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.PartnerEntity#getParticipantRef
-	 * @model opposite="participantRef" required="true" ordered="false"
+	 * @model opposite="participantRef" ordered="false"
 	 * @generated
 	 */
 	EList<PartnerEntity> getPartnerEntityRef();
@@ -140,7 +140,7 @@ public interface Participant extends BaseElement {
 	 * @return the value of the '<em>Partner Role Ref</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getParticipant_PartnerRoleRef()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.PartnerRole#getParticipantRef
-	 * @model opposite="participantRef" required="true" ordered="false"
+	 * @model opposite="participantRef" ordered="false"
 	 * @generated
 	 */
 	EList<PartnerRole> getPartnerRoleRef();
@@ -156,7 +156,7 @@ public interface Participant extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Interface Refs</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getParticipant_InterfaceRefs()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<BPMNInterface> getInterfaceRefs();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/PartnerEntity.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/PartnerEntity.java
index b76196fedde..fc46fb1a7c1 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/PartnerEntity.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/PartnerEntity.java
@@ -65,7 +65,7 @@ public interface PartnerEntity extends RootElement {
 	 * @return the value of the '<em>Participant Ref</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getPartnerEntity_ParticipantRef()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.Participant#getPartnerEntityRef
-	 * @model opposite="partnerEntityRef" required="true" ordered="false"
+	 * @model opposite="partnerEntityRef" ordered="false"
 	 * @generated
 	 */
 	EList<Participant> getParticipantRef();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/PartnerRole.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/PartnerRole.java
index 824a9fd86d9..2eb8070b33f 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/PartnerRole.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/PartnerRole.java
@@ -64,7 +64,7 @@ public interface PartnerRole extends RootElement {
 	 * @return the value of the '<em>Participant Ref</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getPartnerRole_ParticipantRef()
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.Participant#getPartnerRoleRef
-	 * @model opposite="partnerRoleRef" required="true" ordered="false"
+	 * @model opposite="partnerRoleRef" ordered="false"
 	 * @generated
 	 */
 	EList<Participant> getParticipantRef();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Resource.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Resource.java
index 11b5d1e7873..33aa7d1bffa 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Resource.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/Resource.java
@@ -35,7 +35,7 @@ public interface Resource extends ItemDefinition {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Resource Parameters</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getResource_ResourceParameters()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<ResourceParameter> getResourceParameters();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ResourceRole.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ResourceRole.java
index d4d4449656a..3ef78ca8a0b 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ResourceRole.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ResourceRole.java
@@ -118,7 +118,7 @@ public interface ResourceRole extends BaseElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Resource Parameter Bindings</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getResourceRole_ResourceParameterBindings()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='resourceParameterBindings '"
 	 * @generated
 	 */
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/StandardLoopCharacteristics.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/StandardLoopCharacteristics.java
index 7d4d30ceb8f..2f815f8ca73 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/StandardLoopCharacteristics.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/StandardLoopCharacteristics.java
@@ -88,24 +88,13 @@ public interface StandardLoopCharacteristics extends LoopCharacteristics {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Test Before</em>' attribute.
-	 * @see #setTestBefore(boolean)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getStandardLoopCharacteristics_TestBefore()
-	 * @model dataType="org.eclipse.uml2.types.Boolean" required="true" ordered="false"
+	 * @model dataType="org.eclipse.uml2.types.Boolean" required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
 	 * @generated
 	 */
 	boolean isTestBefore();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.bpmn.BPMNProfile.StandardLoopCharacteristics#isTestBefore <em>Test Before</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Test Before</em>' attribute.
-	 * @see #isTestBefore()
-	 * @generated
-	 */
-	void setTestBefore(boolean value);
-
-	/**
 	 * Returns the value of the '<em><b>Loop Condition</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -114,24 +103,13 @@ public interface StandardLoopCharacteristics extends LoopCharacteristics {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Loop Condition</em>' reference.
-	 * @see #setLoopCondition(BPMNExpression)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getStandardLoopCharacteristics_LoopCondition()
-	 * @model required="true" ordered="false"
+	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
 	 * @generated
 	 */
 	BPMNExpression getLoopCondition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.bpmn.BPMNProfile.StandardLoopCharacteristics#getLoopCondition <em>Loop Condition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Loop Condition</em>' reference.
-	 * @see #getLoopCondition()
-	 * @generated
-	 */
-	void setLoopCondition(BPMNExpression value);
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/SubConversation.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/SubConversation.java
index 0ba50233004..e9ebc18129d 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/SubConversation.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/SubConversation.java
@@ -35,7 +35,7 @@ public interface SubConversation extends ConversationNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Conversation Nodes</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getSubConversation_ConversationNodes()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<ConversationNode> getConversationNodes();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/SubProcess.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/SubProcess.java
index ad13aeb2ef7..47a9bde0e50 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/SubProcess.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/SubProcess.java
@@ -91,7 +91,7 @@ public interface SubProcess extends BPMNActivity, FlowElementsContainer {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Has Lane Sets</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getSubProcess_HasLaneSets()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<LaneSet> getHasLaneSets();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ThrowEvent.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ThrowEvent.java
index 50e4b40c2fe..453d9572da6 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ThrowEvent.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/ThrowEvent.java
@@ -39,7 +39,7 @@ public interface ThrowEvent extends BPMNEvent {
 	 * @return the value of the '<em>Base Call Operation Action</em>' reference.
 	 * @see #setBase_CallOperationAction(CallOperationAction)
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getThrowEvent_Base_CallOperationAction()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	CallOperationAction getBase_CallOperationAction();
@@ -91,7 +91,7 @@ public interface ThrowEvent extends BPMNEvent {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Data Input Association</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getThrowEvent_DataInputAssociation()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<DataInputAssociation> getDataInputAssociation();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/UserTask.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/UserTask.java
index e168c8defa6..760026356aa 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/UserTask.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/UserTask.java
@@ -91,7 +91,7 @@ public interface UserTask extends Task {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Renderings</em>' reference list.
 	 * @see org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage#getUserTask_Renderings()
-	 * @model required="true" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
 	EList<Rendering> getRenderings();
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BPMNProcessImpl.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BPMNProcessImpl.java
index 858abf7f275..a9beffc3460 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BPMNProcessImpl.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BPMNProcessImpl.java
@@ -5,7 +5,6 @@ package org.eclipse.papyrus.bpmn.BPMNProfile.impl;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 import java.util.Map;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.BasicDiagnostic;
@@ -72,16 +71,6 @@ public class BPMNProcessImpl extends CallableElementImpl implements BPMNProcess
 	protected EList<LaneSet> laneSets;
 
 	/**
-	 * The cached value of the '{@link #getFlowElements() <em>Flow Elements</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFlowElements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<FlowElement> flowElements;
-
-	/**
 	 * The default value of the '{@link #getProcessType() <em>Process Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -192,16 +181,6 @@ public class BPMNProcessImpl extends CallableElementImpl implements BPMNProcess
 	protected Monitoring monitoring;
 
 	/**
-	 * The cached value of the '{@link #getSupports() <em>Supports</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSupports()
-	 * @generated
-	 * @ordered
-	 */
-	protected BPMNProcess supports;
-
-	/**
 	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -255,13 +234,10 @@ public class BPMNProcessImpl extends CallableElementImpl implements BPMNProcess
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	public EList<FlowElement> getFlowElements() {
-		if (flowElements == null) {
-			flowElements = new EObjectWithInverseResolvingEList<FlowElement>(FlowElement.class, this, BPMNProfilePackage.BPMN_PROCESS__FLOW_ELEMENTS, BPMNProfilePackage.FLOW_ELEMENT__CONTAINER);
-		}
-		return flowElements;
+		return BPMNProcessCustom.getFlowElements(this);
 	}
 
 	/**
@@ -497,36 +473,17 @@ public class BPMNProcessImpl extends CallableElementImpl implements BPMNProcess
 	 * @generated
 	 */
 	public BPMNProcess getSupports() {
-		if (supports != null && supports.eIsProxy()) {
-			InternalEObject oldSupports = (InternalEObject)supports;
-			supports = (BPMNProcess)eResolveProxy(oldSupports);
-			if (supports != oldSupports) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPMNProfilePackage.BPMN_PROCESS__SUPPORTS, oldSupports, supports));
-			}
-		}
-		return supports;
+		BPMNProcess supports = basicGetSupports();
+		return supports != null && supports.eIsProxy() ? (BPMNProcess)eResolveProxy((InternalEObject)supports) : supports;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	public BPMNProcess basicGetSupports() {
-		return supports;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSupports(BPMNProcess newSupports) {
-		BPMNProcess oldSupports = supports;
-		supports = newSupports;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BPMNProfilePackage.BPMN_PROCESS__SUPPORTS, oldSupports, supports));
+		return this;
 	}
 
 	/**
@@ -689,8 +646,6 @@ public class BPMNProcessImpl extends CallableElementImpl implements BPMNProcess
 		switch (featureID) {
 			case BPMNProfilePackage.BPMN_PROCESS__LANE_SETS:
 				return ((InternalEList<InternalEObject>)(InternalEList<?>)getLaneSets()).basicAdd(otherEnd, msgs);
-			case BPMNProfilePackage.BPMN_PROCESS__FLOW_ELEMENTS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getFlowElements()).basicAdd(otherEnd, msgs);
 			case BPMNProfilePackage.BPMN_PROCESS__RESOURCES:
 				return ((InternalEList<InternalEObject>)(InternalEList<?>)getResources()).basicAdd(otherEnd, msgs);
 		}
@@ -707,8 +662,6 @@ public class BPMNProcessImpl extends CallableElementImpl implements BPMNProcess
 		switch (featureID) {
 			case BPMNProfilePackage.BPMN_PROCESS__LANE_SETS:
 				return ((InternalEList<?>)getLaneSets()).basicRemove(otherEnd, msgs);
-			case BPMNProfilePackage.BPMN_PROCESS__FLOW_ELEMENTS:
-				return ((InternalEList<?>)getFlowElements()).basicRemove(otherEnd, msgs);
 			case BPMNProfilePackage.BPMN_PROCESS__RESOURCES:
 				return ((InternalEList<?>)getResources()).basicRemove(otherEnd, msgs);
 		}
@@ -771,10 +724,6 @@ public class BPMNProcessImpl extends CallableElementImpl implements BPMNProcess
 				getLaneSets().clear();
 				getLaneSets().addAll((Collection<? extends LaneSet>)newValue);
 				return;
-			case BPMNProfilePackage.BPMN_PROCESS__FLOW_ELEMENTS:
-				getFlowElements().clear();
-				getFlowElements().addAll((Collection<? extends FlowElement>)newValue);
-				return;
 			case BPMNProfilePackage.BPMN_PROCESS__PROCESS_TYPE:
 				setProcessType((ProcessType)newValue);
 				return;
@@ -800,9 +749,6 @@ public class BPMNProcessImpl extends CallableElementImpl implements BPMNProcess
 			case BPMNProfilePackage.BPMN_PROCESS__MONITORING:
 				setMonitoring((Monitoring)newValue);
 				return;
-			case BPMNProfilePackage.BPMN_PROCESS__SUPPORTS:
-				setSupports((BPMNProcess)newValue);
-				return;
 			case BPMNProfilePackage.BPMN_PROCESS__PROPERTIES:
 				getProperties().clear();
 				getProperties().addAll((Collection<? extends BPMNProperty>)newValue);
@@ -826,9 +772,6 @@ public class BPMNProcessImpl extends CallableElementImpl implements BPMNProcess
 			case BPMNProfilePackage.BPMN_PROCESS__LANE_SETS:
 				getLaneSets().clear();
 				return;
-			case BPMNProfilePackage.BPMN_PROCESS__FLOW_ELEMENTS:
-				getFlowElements().clear();
-				return;
 			case BPMNProfilePackage.BPMN_PROCESS__PROCESS_TYPE:
 				setProcessType(PROCESS_TYPE_EDEFAULT);
 				return;
@@ -853,9 +796,6 @@ public class BPMNProcessImpl extends CallableElementImpl implements BPMNProcess
 			case BPMNProfilePackage.BPMN_PROCESS__MONITORING:
 				setMonitoring((Monitoring)null);
 				return;
-			case BPMNProfilePackage.BPMN_PROCESS__SUPPORTS:
-				setSupports((BPMNProcess)null);
-				return;
 			case BPMNProfilePackage.BPMN_PROCESS__PROPERTIES:
 				getProperties().clear();
 				return;
@@ -877,7 +817,7 @@ public class BPMNProcessImpl extends CallableElementImpl implements BPMNProcess
 			case BPMNProfilePackage.BPMN_PROCESS__LANE_SETS:
 				return laneSets != null && !laneSets.isEmpty();
 			case BPMNProfilePackage.BPMN_PROCESS__FLOW_ELEMENTS:
-				return flowElements != null && !flowElements.isEmpty();
+				return !getFlowElements().isEmpty();
 			case BPMNProfilePackage.BPMN_PROCESS__PROCESS_TYPE:
 				return processType != PROCESS_TYPE_EDEFAULT;
 			case BPMNProfilePackage.BPMN_PROCESS__IS_CLOSED:
@@ -895,7 +835,7 @@ public class BPMNProcessImpl extends CallableElementImpl implements BPMNProcess
 			case BPMNProfilePackage.BPMN_PROCESS__MONITORING:
 				return monitoring != null;
 			case BPMNProfilePackage.BPMN_PROCESS__SUPPORTS:
-				return supports != null;
+				return basicGetSupports() != null;
 			case BPMNProfilePackage.BPMN_PROCESS__PROPERTIES:
 				return properties != null && !properties.isEmpty();
 			case BPMNProfilePackage.BPMN_PROCESS__RESOURCES:
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BPMNProfile.ecore b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BPMNProfile.ecore
index 32273c8de65..5f3345222aa 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BPMNProfile.ecore
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BPMNProfile.ecore
@@ -21,19 +21,19 @@
   <eClassifiers xsi:type="ecore:EClass" name="NonExclusiveGateway" abstract="true"
       eSuperTypes="#//Gateway">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_JoinNode" ordered="false"
-        lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//JoinNode"/>
+        eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//JoinNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ForkNode" ordered="false"
-        lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//ForkNode"/>
+        eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//ForkNode"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Gateway" abstract="true" eSuperTypes="#//FlowNode">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ControlNode" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//ControlNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityGroup" ordered="false"
-        lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//ActivityGroup"/>
+        eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//ActivityGroup"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FlowNode" abstract="true" eSuperTypes="#//FlowElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityNode" ordered="false"
-        lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//ActivityNode"/>
+        eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//ActivityNode"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FlowElement" abstract="true" eSuperTypes="#//BaseElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="auditing" ordered="false"
@@ -41,28 +41,29 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="monitoring" ordered="false"
         eType="#//Monitoring"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="_categoryValueRef" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//CategoryValue" eOpposite="#//CategoryValue/categorizedFlowElements">
+        upperBound="-1" eType="#//CategoryValue" eOpposite="#//CategoryValue/categorizedFlowElements">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value=" categoryValueRef"/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="container" ordered="false"
-        lowerBound="1" eType="#//FlowElementsContainer" eOpposite="#//FlowElementsContainer/flowElements"/>
+        lowerBound="1" eType="#//FlowElementsContainer" changeable="false" volatile="true"
+        transient="true" derived="true" eOpposite="#//FlowElementsContainer/flowElements"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BaseElement" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" ordered="false" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="extensionValues" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ExtensionAttributeValue"/>
+        upperBound="-1" eType="#//ExtensionAttributeValue"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Element" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="documentation" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Documentation"/>
+        upperBound="-1" eType="#//Documentation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="extensionDefinitions" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ExtensionDefinition"/>
+        upperBound="-1" eType="#//ExtensionDefinition"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNAssociation" eOpposite="#//BPMNAssociation/sourceRef"/>
+        upperBound="-1" eType="#//BPMNAssociation" eOpposite="#//BPMNAssociation/sourceRef"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNAssociation" eOpposite="#//BPMNAssociation/targetRef"/>
+        upperBound="-1" eType="#//BPMNAssociation" eOpposite="#//BPMNAssociation/targetRef"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ExtensionAttributeValue">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Slot" ordered="false"
@@ -92,7 +93,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Stereotype" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Stereotype"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="extensionAttributeDefinitions"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//ExtensionAttributeDefinition"/>
+        ordered="false" upperBound="-1" eType="#//ExtensionAttributeDefinition"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BPMNAssociation" eSuperTypes="#//BPMNArtifact">
     <eOperations name="AssociationEnd" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -131,14 +132,15 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_EnumerationLiteral"
         ordered="false" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="categorizedFlowElements"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//FlowElement" eOpposite="#//FlowElement/_categoryValueRef"/>
+        ordered="false" upperBound="-1" eType="#//FlowElement" eOpposite="#//FlowElement/_categoryValueRef"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FlowElementsContainer" abstract="true"
       eSuperTypes="#//BaseElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="laneSets" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//LaneSet" eOpposite="#//LaneSet/flowElementsContainer"/>
+        upperBound="-1" eType="#//LaneSet" eOpposite="#//LaneSet/flowElementsContainer"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="flowElements" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//FlowElement" eOpposite="#//FlowElement/container"/>
+        upperBound="-1" eType="#//FlowElement" changeable="false" volatile="true"
+        transient="true" derived="true" eOpposite="#//FlowElement/container"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="LaneSet" eSuperTypes="#//BaseElement">
     <eOperations name="LaneSetlanes" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -189,9 +191,11 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityPartition"
         ordered="false" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//ActivityPartition"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="lanes" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Lane" eOpposite="#//Lane/laneSet"/>
+        upperBound="-1" eType="#//Lane" changeable="false" volatile="true" transient="true"
+        derived="true" eOpposite="#//Lane/laneSet"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="parentLane" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Lane"/>
+        upperBound="-1" eType="#//Lane" changeable="false" volatile="true" transient="true"
+        derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="flowElementsContainer"
         ordered="false" eType="#//FlowElementsContainer" eOpposite="#//FlowElementsContainer/laneSets"/>
   </eClassifiers>
@@ -253,17 +257,18 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="flowNodeRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//FlowNode"/>
+        upperBound="-1" eType="#//FlowNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="partitionElementRef" ordered="false"
         eType="#//BaseElement"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="childLaneSet" ordered="false"
-        lowerBound="1" eType="#//LaneSet">
+        eType="#//LaneSet" changeable="false" volatile="true" transient="true" derived="true">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="childLaneSet "/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="laneSet" ordered="false"
-        lowerBound="1" eType="#//LaneSet" eOpposite="#//LaneSet/lanes"/>
+        eType="#//LaneSet" changeable="false" volatile="true" transient="true" derived="true"
+        eOpposite="#//LaneSet/lanes"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SequenceFlow" eSuperTypes="#//FlowElement">
     <eOperations name="SequenceFlowconditionExpression" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -311,7 +316,7 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BPMNExpression" eSuperTypes="#//BaseElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_OpaqueExpression"
-        ordered="false" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueExpression"/>
+        ordered="false" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueExpression"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EventBasedGateway" eSuperTypes="#//Gateway">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="instantiate" ordered="false"
@@ -393,9 +398,9 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_DecisionNode" ordered="false"
-        lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//DecisionNode"/>
+        eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//DecisionNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_MergeNode" ordered="false"
-        lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//MergeNode"/>
+        eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//MergeNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="default" ordered="false"
         eType="#//SequenceFlow"/>
   </eClassifiers>
@@ -419,13 +424,13 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="exporterVersion" ordered="false"
         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="extensions" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNExtension"/>
+        upperBound="-1" eType="#//BPMNExtension"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="imports" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Import"/>
+        upperBound="-1" eType="#//Import"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="relationships" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNRelationship"/>
+        upperBound="-1" eType="#//BPMNRelationship"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="rootElements" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//RootElement" eOpposite="#//RootElement/definition"/>
+        upperBound="-1" eType="#//RootElement" eOpposite="#//RootElement/definition"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BPMNExtension">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Stereotype" ordered="false"
@@ -543,15 +548,16 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Activity" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlationSubscriptions"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//CorrelationSubscription"/>
+        ordered="false" upperBound="-1" eType="#//CorrelationSubscription"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="monitoring" ordered="false"
         eType="#//Monitoring"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="supports" ordered="false"
-        lowerBound="1" eType="#//BPMNProcess"/>
+        lowerBound="1" eType="#//BPMNProcess" changeable="false" volatile="true" transient="true"
+        derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="properties" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNProperty"/>
+        upperBound="-1" eType="#//BPMNProperty"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="resources" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ResourceRole" eOpposite="#//ResourceRole/process"/>
+        upperBound="-1" eType="#//ResourceRole" eOpposite="#//ResourceRole/process"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CallableElement" abstract="true" eSuperTypes="#//RootElement">
     <eOperations name="CallableEelementsupportedInterfaceRefs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -583,9 +589,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="ioSpecification" ordered="false"
         eType="#//InputOutputSpecification"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="supportedInterfaceRefs"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//BPMNInterface"/>
+        ordered="false" upperBound="-1" eType="#//BPMNInterface"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="ioBinding" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//InputOutputBinding"/>
+        upperBound="-1" eType="#//InputOutputBinding"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="InputOutputSpecification" eSuperTypes="#//BaseElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Behavior" ordered="false"
@@ -593,9 +599,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Action" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Action"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataInputs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataInput"/>
+        upperBound="-1" eType="#//DataInput"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataOutputs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataOutput"/>
+        upperBound="-1" eType="#//DataOutput"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="inputSets" ordered="false"
         lowerBound="1" upperBound="-1" eType="#//InputSet"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outputSets" ordered="false"
@@ -642,17 +648,17 @@
         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"
         defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_InputPin" ordered="false"
-        lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//InputPin"/>
+        eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//InputPin"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Parameter" ordered="false"
-        lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
+        eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityParameterNode"
-        ordered="false" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//ActivityParameterNode"/>
+        ordered="false" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//ActivityParameterNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="inputSetRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//InputSet" eOpposite="#//InputSet/dataInputRefs"/>
+        upperBound="-1" eType="#//InputSet" eOpposite="#//InputSet/dataInputRefs"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="inputSetWithOptional" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//InputSet" eOpposite="#//InputSet/optionalInputRefs"/>
+        upperBound="-1" eType="#//InputSet" eOpposite="#//InputSet/optionalInputRefs"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="inputSetWithWhileExecuting"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//InputSet" eOpposite="#//InputSet/whileExecutingInputRefs"/>
+        ordered="false" upperBound="-1" eType="#//InputSet" eOpposite="#//InputSet/whileExecutingInputRefs"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ItemAwareElement" abstract="true" eSuperTypes="#//BaseElement">
     <eOperations name="ItemAwareElementdataState" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -668,7 +674,7 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataState" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataState"/>
+        upperBound="-1" eType="#//DataState"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_TypedElement" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//TypedElement"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="itemSubjectRef" ordered="false"
@@ -755,11 +761,11 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ParameterSet" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//ParameterSet"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="optionalInputRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataInput" eOpposite="#//DataInput/inputSetWithOptional"/>
+        upperBound="-1" eType="#//DataInput" eOpposite="#//DataInput/inputSetWithOptional"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="whileExecutingInputRefs"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//DataInput" eOpposite="#//DataInput/inputSetWithWhileExecuting"/>
+        ordered="false" upperBound="-1" eType="#//DataInput" eOpposite="#//DataInput/inputSetWithWhileExecuting"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataInputRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataInput" eOpposite="#//DataInput/inputSetRefs"/>
+        upperBound="-1" eType="#//DataInput" eOpposite="#//DataInput/inputSetRefs"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="DataOutput" eSuperTypes="#//ItemAwareElement">
     <eOperations name="DataOutputnotation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -787,20 +793,20 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_OutputPin" ordered="false"
-        lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//OutputPin"/>
+        eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//OutputPin"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isCollection" ordered="false"
         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"
         defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Parameter" ordered="false"
-        lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
+        eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityParameterNode"
-        ordered="false" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//ActivityParameterNode"/>
+        ordered="false" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//ActivityParameterNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outputSetRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//OutputSet" eOpposite="#//OutputSet/dataOutputRefs"/>
+        upperBound="-1" eType="#//OutputSet" eOpposite="#//OutputSet/dataOutputRefs"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outputSetWithOptional"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//OutputSet"/>
+        ordered="false" upperBound="-1" eType="#//OutputSet"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outputSetWithWhileExecuting"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//OutputSet"/>
+        ordered="false" upperBound="-1" eType="#//OutputSet"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="OutputSet" eSuperTypes="#//BaseElement">
     <eOperations name="OutputSetdataOutputRefs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -842,19 +848,19 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ParameterSet" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//ParameterSet"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="optionalOutputRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataOutput">
+        upperBound="-1" eType="#//DataOutput">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="optionalOutputRefs "/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="whileExecutingOutputRefs"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//DataOutput">
+        ordered="false" upperBound="-1" eType="#//DataOutput">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="whileExecutingOutputRefs "/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataOutputRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataOutput" eOpposite="#//DataOutput/outputSetRefs"/>
+        upperBound="-1" eType="#//DataOutput" eOpposite="#//DataOutput/outputSetRefs"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BPMNInterface" eSuperTypes="#//RootElement">
     <eOperations name="Interfaceoperationmultiplicity" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -910,9 +916,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="implementationRef" ordered="false"
         eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="operations" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNOperation"/>
+        upperBound="-1" eType="#//BPMNOperation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="callableElements" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//CallableElement"/>
+        upperBound="-1" eType="#//CallableElement"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BPMNOperation" eSuperTypes="#//BaseElement">
     <eOperations name="BPMNOperationowner" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -972,7 +978,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="outMessageRef" ordered="false"
         eType="#//BPMNMessage"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="errorRef" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Error"/>
+        upperBound="-1" eType="#//Error"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BPMNMessage" eSuperTypes="#//ItemDefinition">
     <eOperations name="MessageitemRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1026,21 +1032,21 @@
         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"
         defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="participantAssociations"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//ParticipantAssociation"/>
+        ordered="false" upperBound="-1" eType="#//ParticipantAssociation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="conversationLinks" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ConversationLink" eOpposite="#//ConversationLink/collaboration"/>
+        upperBound="-1" eType="#//ConversationLink" eOpposite="#//ConversationLink/collaboration"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="messageFlowAssociations"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//MessageFlowAssociation"/>
+        ordered="false" upperBound="-1" eType="#//MessageFlowAssociation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="messageFlows" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//MessageFlow"/>
+        upperBound="-1" eType="#//MessageFlow"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Collaboration" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="conversations" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ConversationNode"/>
+        upperBound="-1" eType="#//ConversationNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlationKeys" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//CorrelationKey"/>
+        upperBound="-1" eType="#//CorrelationKey"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="participants" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Participant"/>
+        upperBound="-1" eType="#//Participant"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ParticipantAssociation" eSuperTypes="#//BaseElement">
     <eOperations name="ParticipantAssociationinnerParticipantRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1194,18 +1200,17 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="partnerEntityRef" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//PartnerEntity" eOpposite="#//PartnerEntity/participantRef"/>
+        upperBound="-1" eType="#//PartnerEntity" eOpposite="#//PartnerEntity/participantRef"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="partnerRoleRef" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//PartnerRole" eOpposite="#//PartnerRole/participantRef"/>
+        upperBound="-1" eType="#//PartnerRole" eOpposite="#//PartnerRole/participantRef"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="interfaceRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNInterface"/>
+        upperBound="-1" eType="#//BPMNInterface"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="InteractionNode" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Element" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingConversationLinks"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//ConversationLink"
-        eOpposite="#//ConversationLink/sourceRef"/>
+        ordered="false" upperBound="-1" eType="#//ConversationLink" eOpposite="#//ConversationLink/sourceRef"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="incomingConversationLinks"
         ordered="false" lowerBound="1" eType="#//ConversationLink" eOpposite="#//ConversationLink/targetRef"/>
   </eClassifiers>
@@ -1243,7 +1248,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_InstanceSpecification"
         ordered="false" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//InstanceSpecification"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="participantRef" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Participant" eOpposite="#//Participant/partnerEntityRef"/>
+        upperBound="-1" eType="#//Participant" eOpposite="#//Participant/partnerEntityRef"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PartnerRole" eSuperTypes="#//RootElement">
     <eOperations name="PartnerRoleparticipantRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1261,7 +1266,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="participantRef" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Participant" eOpposite="#//Participant/partnerRoleRef"/>
+        upperBound="-1" eType="#//Participant" eOpposite="#//Participant/partnerRoleRef"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="MessageFlowAssociation" eSuperTypes="#//BaseElement">
     <eOperations name="MessageFlowAssociationinnerMessageFlowRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1357,9 +1362,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_InformationFlow" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//InformationFlow"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="messageFlowRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//MessageFlow"/>
+        upperBound="-1" eType="#//MessageFlow"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlationKeys" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//CorrelationKey"/>
+        upperBound="-1" eType="#//CorrelationKey"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="participantRefs" ordered="false"
         lowerBound="2" upperBound="-1" eType="#//Participant"/>
   </eClassifiers>
@@ -1367,7 +1372,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlationPropertyRef"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//CorrelationProperty"/>
+        ordered="false" upperBound="-1" eType="#//CorrelationProperty"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CorrelationProperty" eSuperTypes="#//BaseElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false"
@@ -1407,7 +1412,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlationKeyRef" ordered="false"
         lowerBound="1" eType="#//CorrelationKey"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="correlationPropertyBinding"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//CorrelationPropertyBinding"/>
+        ordered="false" upperBound="-1" eType="#//CorrelationPropertyBinding"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CorrelationPropertyBinding" eSuperTypes="#//BaseElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false"
@@ -1515,7 +1520,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="resourceRef" ordered="false"
         eType="#//Resource"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="resourceParameterBindings"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//ResourceParameterBinding">
+        ordered="false" upperBound="-1" eType="#//ResourceParameterBinding">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="resourceParameterBindings "/>
       </eAnnotations>
@@ -1553,7 +1558,7 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="resourceParameters" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ResourceParameter"/>
+        upperBound="-1" eType="#//ResourceParameter"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ResourceParameter" eSuperTypes="#//BaseElement">
     <eOperations name="ResourceParameterowner" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1660,9 +1665,9 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="script" unique="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scriptFormat" lowerBound="1"
         upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="scriptFormat" upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//String"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GlobalTask" eSuperTypes="#//CallableElement">
     <eOperations name="GlobalTasksupportedInterfaceRefs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1680,7 +1685,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_OpaqueBehavior" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="resources" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ResourceRole"/>
+        upperBound="-1" eType="#//ResourceRole"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GlobalBusinessRuleTask" eSuperTypes="#//GlobalTask">
     <eOperations name="GlobalBusinessRuleTaskimplementation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1696,7 +1701,7 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="implementation" unique="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//String"
+        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//String"
         defaultValueLiteral="##unspecified"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CompensateEventDefinition" eSuperTypes="#//EventDefinition">
@@ -1799,19 +1804,19 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="activityClass" ordered="false"
         eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="properties" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNProperty"/>
+        upperBound="-1" eType="#//BPMNProperty"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="default" ordered="false"
         eType="#//SequenceFlow"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="boundaryEventRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BoundaryEvent"/>
+        upperBound="-1" eType="#//BoundaryEvent"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataInputAssociations"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//DataInputAssociation"/>
+        ordered="false" upperBound="-1" eType="#//DataInputAssociation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataOutputAssociations"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//DataOutputAssociation"/>
+        ordered="false" upperBound="-1" eType="#//DataOutputAssociation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="loopCharacteristics" ordered="false"
         eType="#//LoopCharacteristics"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="resources" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ResourceRole"/>
+        upperBound="-1" eType="#//ResourceRole"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BoundaryEvent" eSuperTypes="#//CatchEvent">
     <eOperations name="boundaryEventattachedToRef" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1829,7 +1834,8 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelActivity" ordered="false"
         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="attachedToRef" ordered="false"
-        lowerBound="1" eType="#//BPMNActivity"/>
+        lowerBound="1" eType="#//BPMNActivity" changeable="false" volatile="true"
+        transient="true" derived="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CatchEvent" abstract="true" eSuperTypes="#//BPMNEvent">
     <eOperations name="catchEventeventDefinitionsRefs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1848,25 +1854,25 @@
         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"
         defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_AcceptEventAction"
-        ordered="false" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//AcceptEventAction"/>
+        ordered="false" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//AcceptEventAction"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_InitialNode" ordered="false"
-        lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//InitialNode"/>
+        eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//InitialNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataOutputAssociation"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//DataOutputAssociation"/>
+        ordered="false" upperBound="-1" eType="#//DataOutputAssociation"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BPMNEvent" abstract="true" eSuperTypes="#//FlowNode">
     <eStructuralFeatures xsi:type="ecore:EReference" name="eventClass" ordered="false"
         eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="_eventDefinitions" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//EventDefinition">
+        upperBound="-1" eType="#//EventDefinition">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value=" eventDefinitions"/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="properties" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//BPMNProperty"/>
+        upperBound="-1" eType="#//BPMNProperty"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="eventDefinitionRefs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//EventDefinition"/>
+        upperBound="-1" eType="#//EventDefinition"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="DataOutputAssociation" eSuperTypes="#//DataAssociation">
     <eOperations name="dataOutputAssociationsource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1940,7 +1946,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="transformation" ordered="false"
         lowerBound="1" eType="#//FormalExpression"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="assignment" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Assignment"/>
+        upperBound="-1" eType="#//Assignment"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Assignment" eSuperTypes="#//BaseElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Dependency" ordered="false"
@@ -2051,11 +2057,11 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_CallOperationAction"
-        ordered="false" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction"/>
+        ordered="false" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_FlowFinalNode" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//FlowFinalNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="dataInputAssociation" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//DataInputAssociation"/>
+        upperBound="-1" eType="#//DataInputAssociation"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="MessageEventDefinition" eSuperTypes="#//EventDefinition">
     <eStructuralFeatures xsi:type="ecore:EReference" name="messageRef" ordered="false"
@@ -2096,7 +2102,7 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//LinkEventDefinition" eOpposite="#//LinkEventDefinition/_target"/>
+        upperBound="-1" eType="#//LinkEventDefinition" eOpposite="#//LinkEventDefinition/_target"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_CallEvent" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>
   </eClassifiers>
@@ -2132,7 +2138,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Enumeration" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="categoryValue" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//CategoryValue"/>
+        upperBound="-1" eType="#//CategoryValue"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Group" eSuperTypes="#//BPMNArtifact">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_ActivityPartition"
@@ -2249,7 +2255,7 @@
         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//String"
         defaultValueLiteral="##unspecified"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="renderings" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Rendering"/>
+        upperBound="-1" eType="#//Rendering"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Task" eSuperTypes="#//BPMNActivity">
     <eStructuralFeatures xsi:type="ecore:EReference" name="ioSpecification" ordered="false"
@@ -2287,10 +2293,10 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="implementation" unique="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//String"
+        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//String"
         defaultValueLiteral="##unspecified"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="renderings" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//Rendering"/>
+        upperBound="-1" eType="#//Rendering"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GlobalManualTask" eSuperTypes="#//GlobalTask"/>
   <eClassifiers xsi:type="ecore:EClass" name="ManualTask" eSuperTypes="#//Task">
@@ -2312,7 +2318,7 @@
       </eParameters>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="conversationNodes" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//ConversationNode"/>
+        upperBound="-1" eType="#//ConversationNode"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GlobalConversation" eSuperTypes="#//BPMNCollaboration">
     <eOperations name="GlobalConversationcontainedelements" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -2362,7 +2368,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="calledCollaborationRef"
         ordered="false" eType="#//BPMNCollaboration"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="participantAssociations"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//ParticipantAssociation"/>
+        ordered="false" upperBound="-1" eType="#//ParticipantAssociation"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Conversation" eSuperTypes="#//ConversationNode"/>
   <eClassifiers xsi:type="ecore:EClass" name="SubProcess" eSuperTypes="#//BPMNActivity #//FlowElementsContainer">
@@ -2384,7 +2390,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_StructuredActivityNode"
         ordered="false" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//StructuredActivityNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="hasLaneSets" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//LaneSet"/>
+        upperBound="-1" eType="#//LaneSet"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CallActivity" eSuperTypes="#//BPMNActivity">
     <eOperations name="CallActivitycalledElementRefvalues" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -2402,7 +2408,8 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_CallBehaviorAction"
         ordered="false" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//CallBehaviorAction"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="calledElementRef" ordered="false"
-        eType="#//CallableElement"/>
+        eType="#//CallableElement" changeable="false" volatile="true" transient="true"
+        derived="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BusinessRuleTask" eSuperTypes="#//Task">
     <eOperations name="BusinessRuleTaskimplementation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -2545,9 +2552,11 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_LoopNode" ordered="false"
         lowerBound="1" eType="ecore:EClass http://www.eclipse.org/uml2/5.0.0/UML#//LoopNode"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="testBefore" ordered="false"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"/>
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//Boolean"
+        changeable="false" volatile="true" transient="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="loopCondition" ordered="false"
-        lowerBound="1" eType="#//BPMNExpression"/>
+        lowerBound="1" eType="#//BPMNExpression" changeable="false" volatile="true"
+        transient="true" derived="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="MultiInstanceBehavior">
     <eLiterals name="none"/>
@@ -2662,6 +2671,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="noneBehaviorEventRef" ordered="false"
         eType="#//EventDefinition"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="complexBehaviorDefinition"
-        ordered="false" lowerBound="1" upperBound="-1" eType="#//ComplexBehaviorDefinition"/>
+        ordered="false" upperBound="-1" eType="#//ComplexBehaviorDefinition"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BoundaryEventImpl.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BoundaryEventImpl.java
index 4dd71e0e0a8..c33772014d4 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BoundaryEventImpl.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/BoundaryEventImpl.java
@@ -56,16 +56,6 @@ public class BoundaryEventImpl extends CatchEventImpl implements BoundaryEvent {
 	protected boolean cancelActivity = CANCEL_ACTIVITY_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getAttachedToRef() <em>Attached To Ref</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttachedToRef()
-	 * @generated
-	 * @ordered
-	 */
-	protected BPMNActivity attachedToRef;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -111,36 +101,17 @@ public class BoundaryEventImpl extends CatchEventImpl implements BoundaryEvent {
 	 * @generated
 	 */
 	public BPMNActivity getAttachedToRef() {
-		if (attachedToRef != null && attachedToRef.eIsProxy()) {
-			InternalEObject oldAttachedToRef = (InternalEObject)attachedToRef;
-			attachedToRef = (BPMNActivity)eResolveProxy(oldAttachedToRef);
-			if (attachedToRef != oldAttachedToRef) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPMNProfilePackage.BOUNDARY_EVENT__ATTACHED_TO_REF, oldAttachedToRef, attachedToRef));
-			}
-		}
-		return attachedToRef;
+		BPMNActivity attachedToRef = basicGetAttachedToRef();
+		return attachedToRef != null && attachedToRef.eIsProxy() ? (BPMNActivity)eResolveProxy((InternalEObject)attachedToRef) : attachedToRef;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	public BPMNActivity basicGetAttachedToRef() {
-		return attachedToRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAttachedToRef(BPMNActivity newAttachedToRef) {
-		BPMNActivity oldAttachedToRef = attachedToRef;
-		attachedToRef = newAttachedToRef;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BPMNProfilePackage.BOUNDARY_EVENT__ATTACHED_TO_REF, oldAttachedToRef, attachedToRef));
+		return BoundaryEventCustom.basicGetAttachedToRef(this);
 	}
 
 	/**
@@ -196,9 +167,6 @@ public class BoundaryEventImpl extends CatchEventImpl implements BoundaryEvent {
 			case BPMNProfilePackage.BOUNDARY_EVENT__CANCEL_ACTIVITY:
 				setCancelActivity((Boolean)newValue);
 				return;
-			case BPMNProfilePackage.BOUNDARY_EVENT__ATTACHED_TO_REF:
-				setAttachedToRef((BPMNActivity)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -214,9 +182,6 @@ public class BoundaryEventImpl extends CatchEventImpl implements BoundaryEvent {
 			case BPMNProfilePackage.BOUNDARY_EVENT__CANCEL_ACTIVITY:
 				setCancelActivity(CANCEL_ACTIVITY_EDEFAULT);
 				return;
-			case BPMNProfilePackage.BOUNDARY_EVENT__ATTACHED_TO_REF:
-				setAttachedToRef((BPMNActivity)null);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -232,7 +197,7 @@ public class BoundaryEventImpl extends CatchEventImpl implements BoundaryEvent {
 			case BPMNProfilePackage.BOUNDARY_EVENT__CANCEL_ACTIVITY:
 				return cancelActivity != CANCEL_ACTIVITY_EDEFAULT;
 			case BPMNProfilePackage.BOUNDARY_EVENT__ATTACHED_TO_REF:
-				return attachedToRef != null;
+				return basicGetAttachedToRef() != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/CallActivityImpl.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/CallActivityImpl.java
index e04a6e5ae10..4e28806c220 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/CallActivityImpl.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/CallActivityImpl.java
@@ -47,16 +47,6 @@ public class CallActivityImpl extends BPMNActivityImpl implements CallActivity {
 	protected CallBehaviorAction base_CallBehaviorAction;
 
 	/**
-	 * The cached value of the '{@link #getCalledElementRef() <em>Called Element Ref</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCalledElementRef()
-	 * @generated
-	 * @ordered
-	 */
-	protected CallableElement calledElementRef;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -119,15 +109,8 @@ public class CallActivityImpl extends BPMNActivityImpl implements CallActivity {
 	 * @generated
 	 */
 	public CallableElement getCalledElementRef() {
-		if (calledElementRef != null && calledElementRef.eIsProxy()) {
-			InternalEObject oldCalledElementRef = (InternalEObject)calledElementRef;
-			calledElementRef = (CallableElement)eResolveProxy(oldCalledElementRef);
-			if (calledElementRef != oldCalledElementRef) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPMNProfilePackage.CALL_ACTIVITY__CALLED_ELEMENT_REF, oldCalledElementRef, calledElementRef));
-			}
-		}
-		return calledElementRef;
+		CallableElement calledElementRef = basicGetCalledElementRef();
+		return calledElementRef != null && calledElementRef.eIsProxy() ? (CallableElement)eResolveProxy((InternalEObject)calledElementRef) : calledElementRef;
 	}
 
 	/**
@@ -136,19 +119,7 @@ public class CallActivityImpl extends BPMNActivityImpl implements CallActivity {
 	 * @generated
 	 */
 	public CallableElement basicGetCalledElementRef() {
-		return calledElementRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCalledElementRef(CallableElement newCalledElementRef) {
-		CallableElement oldCalledElementRef = calledElementRef;
-		calledElementRef = newCalledElementRef;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BPMNProfilePackage.CALL_ACTIVITY__CALLED_ELEMENT_REF, oldCalledElementRef, calledElementRef));
+		return CallActivityCustom.basicGetCalledElementRef(this);
 	}
 
 	/**
@@ -205,9 +176,6 @@ public class CallActivityImpl extends BPMNActivityImpl implements CallActivity {
 			case BPMNProfilePackage.CALL_ACTIVITY__BASE_CALL_BEHAVIOR_ACTION:
 				setBase_CallBehaviorAction((CallBehaviorAction)newValue);
 				return;
-			case BPMNProfilePackage.CALL_ACTIVITY__CALLED_ELEMENT_REF:
-				setCalledElementRef((CallableElement)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -223,9 +191,6 @@ public class CallActivityImpl extends BPMNActivityImpl implements CallActivity {
 			case BPMNProfilePackage.CALL_ACTIVITY__BASE_CALL_BEHAVIOR_ACTION:
 				setBase_CallBehaviorAction((CallBehaviorAction)null);
 				return;
-			case BPMNProfilePackage.CALL_ACTIVITY__CALLED_ELEMENT_REF:
-				setCalledElementRef((CallableElement)null);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -241,7 +206,7 @@ public class CallActivityImpl extends BPMNActivityImpl implements CallActivity {
 			case BPMNProfilePackage.CALL_ACTIVITY__BASE_CALL_BEHAVIOR_ACTION:
 				return base_CallBehaviorAction != null;
 			case BPMNProfilePackage.CALL_ACTIVITY__CALLED_ELEMENT_REF:
-				return calledElementRef != null;
+				return basicGetCalledElementRef() != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/FlowElementImpl.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/FlowElementImpl.java
index 1d4622474da..e7a16d485c3 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/FlowElementImpl.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/FlowElementImpl.java
@@ -3,7 +3,6 @@
 package org.eclipse.papyrus.bpmn.BPMNProfile.impl;
 
 import java.util.Collection;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
@@ -67,16 +66,6 @@ public abstract class FlowElementImpl extends BaseElementImpl implements FlowEle
 	protected EList<CategoryValue> _categoryValueRef;
 
 	/**
-	 * The cached value of the '{@link #getContainer() <em>Container</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContainer()
-	 * @generated
-	 * @ordered
-	 */
-	protected FlowElementsContainer container;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -189,58 +178,17 @@ public abstract class FlowElementImpl extends BaseElementImpl implements FlowEle
 	 * @generated
 	 */
 	public FlowElementsContainer getContainer() {
-		if (container != null && container.eIsProxy()) {
-			InternalEObject oldContainer = (InternalEObject)container;
-			container = (FlowElementsContainer)eResolveProxy(oldContainer);
-			if (container != oldContainer) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPMNProfilePackage.FLOW_ELEMENT__CONTAINER, oldContainer, container));
-			}
-		}
-		return container;
+		FlowElementsContainer container = basicGetContainer();
+		return container != null && container.eIsProxy() ? (FlowElementsContainer)eResolveProxy((InternalEObject)container) : container;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	public FlowElementsContainer basicGetContainer() {
-		return container;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetContainer(FlowElementsContainer newContainer, NotificationChain msgs) {
-		FlowElementsContainer oldContainer = container;
-		container = newContainer;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, BPMNProfilePackage.FLOW_ELEMENT__CONTAINER, oldContainer, newContainer);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContainer(FlowElementsContainer newContainer) {
-		if (newContainer != container) {
-			NotificationChain msgs = null;
-			if (container != null)
-				msgs = ((InternalEObject)container).eInverseRemove(this, BPMNProfilePackage.FLOW_ELEMENTS_CONTAINER__FLOW_ELEMENTS, FlowElementsContainer.class, msgs);
-			if (newContainer != null)
-				msgs = ((InternalEObject)newContainer).eInverseAdd(this, BPMNProfilePackage.FLOW_ELEMENTS_CONTAINER__FLOW_ELEMENTS, FlowElementsContainer.class, msgs);
-			msgs = basicSetContainer(newContainer, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BPMNProfilePackage.FLOW_ELEMENT__CONTAINER, newContainer, newContainer));
+		return FlowElementCustom.basicGetContainer(this);
 	}
 
 	/**
@@ -254,10 +202,6 @@ public abstract class FlowElementImpl extends BaseElementImpl implements FlowEle
 		switch (featureID) {
 			case BPMNProfilePackage.FLOW_ELEMENT__CATEGORY_VALUE_REF:
 				return ((InternalEList<InternalEObject>)(InternalEList<?>)get_categoryValueRef()).basicAdd(otherEnd, msgs);
-			case BPMNProfilePackage.FLOW_ELEMENT__CONTAINER:
-				if (container != null)
-					msgs = ((InternalEObject)container).eInverseRemove(this, BPMNProfilePackage.FLOW_ELEMENTS_CONTAINER__FLOW_ELEMENTS, FlowElementsContainer.class, msgs);
-				return basicSetContainer((FlowElementsContainer)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -272,8 +216,6 @@ public abstract class FlowElementImpl extends BaseElementImpl implements FlowEle
 		switch (featureID) {
 			case BPMNProfilePackage.FLOW_ELEMENT__CATEGORY_VALUE_REF:
 				return ((InternalEList<?>)get_categoryValueRef()).basicRemove(otherEnd, msgs);
-			case BPMNProfilePackage.FLOW_ELEMENT__CONTAINER:
-				return basicSetContainer(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -320,9 +262,6 @@ public abstract class FlowElementImpl extends BaseElementImpl implements FlowEle
 				get_categoryValueRef().clear();
 				get_categoryValueRef().addAll((Collection<? extends CategoryValue>)newValue);
 				return;
-			case BPMNProfilePackage.FLOW_ELEMENT__CONTAINER:
-				setContainer((FlowElementsContainer)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -344,9 +283,6 @@ public abstract class FlowElementImpl extends BaseElementImpl implements FlowEle
 			case BPMNProfilePackage.FLOW_ELEMENT__CATEGORY_VALUE_REF:
 				get_categoryValueRef().clear();
 				return;
-			case BPMNProfilePackage.FLOW_ELEMENT__CONTAINER:
-				setContainer((FlowElementsContainer)null);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -366,7 +302,7 @@ public abstract class FlowElementImpl extends BaseElementImpl implements FlowEle
 			case BPMNProfilePackage.FLOW_ELEMENT__CATEGORY_VALUE_REF:
 				return _categoryValueRef != null && !_categoryValueRef.isEmpty();
 			case BPMNProfilePackage.FLOW_ELEMENT__CONTAINER:
-				return container != null;
+				return basicGetContainer() != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/FlowElementsContainerImpl.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/FlowElementsContainerImpl.java
index bbf53e79137..e47b65318c7 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/FlowElementsContainerImpl.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/FlowElementsContainerImpl.java
@@ -40,16 +40,6 @@ public abstract class FlowElementsContainerImpl extends BaseElementImpl implemen
 	 */
 	protected EList<LaneSet> laneSets;
 	/**
-	 * The cached value of the '{@link #getFlowElements() <em>Flow Elements</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFlowElements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<FlowElement> flowElements;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -86,10 +76,9 @@ public abstract class FlowElementsContainerImpl extends BaseElementImpl implemen
 	 * @generated
 	 */
 	public EList<FlowElement> getFlowElements() {
-		if (flowElements == null) {
-			flowElements = new EObjectWithInverseResolvingEList<FlowElement>(FlowElement.class, this, BPMNProfilePackage.FLOW_ELEMENTS_CONTAINER__FLOW_ELEMENTS, BPMNProfilePackage.FLOW_ELEMENT__CONTAINER);
-		}
-		return flowElements;
+		// TODO: implement this method to return the 'Flow Elements' reference list
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
 	}
 
 	/**
@@ -103,8 +92,6 @@ public abstract class FlowElementsContainerImpl extends BaseElementImpl implemen
 		switch (featureID) {
 			case BPMNProfilePackage.FLOW_ELEMENTS_CONTAINER__LANE_SETS:
 				return ((InternalEList<InternalEObject>)(InternalEList<?>)getLaneSets()).basicAdd(otherEnd, msgs);
-			case BPMNProfilePackage.FLOW_ELEMENTS_CONTAINER__FLOW_ELEMENTS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getFlowElements()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -119,8 +106,6 @@ public abstract class FlowElementsContainerImpl extends BaseElementImpl implemen
 		switch (featureID) {
 			case BPMNProfilePackage.FLOW_ELEMENTS_CONTAINER__LANE_SETS:
 				return ((InternalEList<?>)getLaneSets()).basicRemove(otherEnd, msgs);
-			case BPMNProfilePackage.FLOW_ELEMENTS_CONTAINER__FLOW_ELEMENTS:
-				return ((InternalEList<?>)getFlowElements()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -154,10 +139,6 @@ public abstract class FlowElementsContainerImpl extends BaseElementImpl implemen
 				getLaneSets().clear();
 				getLaneSets().addAll((Collection<? extends LaneSet>)newValue);
 				return;
-			case BPMNProfilePackage.FLOW_ELEMENTS_CONTAINER__FLOW_ELEMENTS:
-				getFlowElements().clear();
-				getFlowElements().addAll((Collection<? extends FlowElement>)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -173,9 +154,6 @@ public abstract class FlowElementsContainerImpl extends BaseElementImpl implemen
 			case BPMNProfilePackage.FLOW_ELEMENTS_CONTAINER__LANE_SETS:
 				getLaneSets().clear();
 				return;
-			case BPMNProfilePackage.FLOW_ELEMENTS_CONTAINER__FLOW_ELEMENTS:
-				getFlowElements().clear();
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -191,7 +169,7 @@ public abstract class FlowElementsContainerImpl extends BaseElementImpl implemen
 			case BPMNProfilePackage.FLOW_ELEMENTS_CONTAINER__LANE_SETS:
 				return laneSets != null && !laneSets.isEmpty();
 			case BPMNProfilePackage.FLOW_ELEMENTS_CONTAINER__FLOW_ELEMENTS:
-				return flowElements != null && !flowElements.isEmpty();
+				return !getFlowElements().isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneImpl.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneImpl.java
index 8298b710575..ae29efb65f4 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneImpl.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneImpl.java
@@ -5,9 +5,7 @@ package org.eclipse.papyrus.bpmn.BPMNProfile.impl;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 import java.util.Map;
-
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.BasicDiagnostic;
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;
@@ -87,26 +85,6 @@ public class LaneImpl extends BaseElementImpl implements Lane {
 	protected BaseElement partitionElementRef;
 
 	/**
-	 * The cached value of the '{@link #getChildLaneSet() <em>Child Lane Set</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChildLaneSet()
-	 * @generated
-	 * @ordered
-	 */
-	protected LaneSet childLaneSet;
-
-	/**
-	 * The cached value of the '{@link #getLaneSet() <em>Lane Set</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLaneSet()
-	 * @generated
-	 * @ordered
-	 */
-	protected LaneSet laneSet;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -257,36 +235,17 @@ public class LaneImpl extends BaseElementImpl implements Lane {
 	 * @generated
 	 */
 	public LaneSet getChildLaneSet() {
-		if (childLaneSet != null && childLaneSet.eIsProxy()) {
-			InternalEObject oldChildLaneSet = (InternalEObject)childLaneSet;
-			childLaneSet = (LaneSet)eResolveProxy(oldChildLaneSet);
-			if (childLaneSet != oldChildLaneSet) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPMNProfilePackage.LANE__CHILD_LANE_SET, oldChildLaneSet, childLaneSet));
-			}
-		}
-		return childLaneSet;
+		LaneSet childLaneSet = basicGetChildLaneSet();
+		return childLaneSet != null && childLaneSet.eIsProxy() ? (LaneSet)eResolveProxy((InternalEObject)childLaneSet) : childLaneSet;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	public LaneSet basicGetChildLaneSet() {
-		return childLaneSet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setChildLaneSet(LaneSet newChildLaneSet) {
-		LaneSet oldChildLaneSet = childLaneSet;
-		childLaneSet = newChildLaneSet;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BPMNProfilePackage.LANE__CHILD_LANE_SET, oldChildLaneSet, childLaneSet));
+		return LaneCustom.basicGetChildLaneSet(this);
 	}
 
 	/**
@@ -295,58 +254,17 @@ public class LaneImpl extends BaseElementImpl implements Lane {
 	 * @generated
 	 */
 	public LaneSet getLaneSet() {
-		if (laneSet != null && laneSet.eIsProxy()) {
-			InternalEObject oldLaneSet = (InternalEObject)laneSet;
-			laneSet = (LaneSet)eResolveProxy(oldLaneSet);
-			if (laneSet != oldLaneSet) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPMNProfilePackage.LANE__LANE_SET, oldLaneSet, laneSet));
-			}
-		}
-		return laneSet;
+		LaneSet laneSet = basicGetLaneSet();
+		return laneSet != null && laneSet.eIsProxy() ? (LaneSet)eResolveProxy((InternalEObject)laneSet) : laneSet;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	public LaneSet basicGetLaneSet() {
-		return laneSet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLaneSet(LaneSet newLaneSet, NotificationChain msgs) {
-		LaneSet oldLaneSet = laneSet;
-		laneSet = newLaneSet;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, BPMNProfilePackage.LANE__LANE_SET, oldLaneSet, newLaneSet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLaneSet(LaneSet newLaneSet) {
-		if (newLaneSet != laneSet) {
-			NotificationChain msgs = null;
-			if (laneSet != null)
-				msgs = ((InternalEObject)laneSet).eInverseRemove(this, BPMNProfilePackage.LANE_SET__LANES, LaneSet.class, msgs);
-			if (newLaneSet != null)
-				msgs = ((InternalEObject)newLaneSet).eInverseAdd(this, BPMNProfilePackage.LANE_SET__LANES, LaneSet.class, msgs);
-			msgs = basicSetLaneSet(newLaneSet, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BPMNProfilePackage.LANE__LANE_SET, newLaneSet, newLaneSet));
+		return LaneCustom.basicGetLaneSet(this);
 	}
 
 	/**
@@ -455,36 +373,6 @@ public class LaneImpl extends BaseElementImpl implements Lane {
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case BPMNProfilePackage.LANE__LANE_SET:
-				if (laneSet != null)
-					msgs = ((InternalEObject)laneSet).eInverseRemove(this, BPMNProfilePackage.LANE_SET__LANES, LaneSet.class, msgs);
-				return basicSetLaneSet((LaneSet)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case BPMNProfilePackage.LANE__LANE_SET:
-				return basicSetLaneSet(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case BPMNProfilePackage.LANE__BASE_ACTIVITY_PARTITION:
@@ -530,12 +418,6 @@ public class LaneImpl extends BaseElementImpl implements Lane {
 			case BPMNProfilePackage.LANE__PARTITION_ELEMENT_REF:
 				setPartitionElementRef((BaseElement)newValue);
 				return;
-			case BPMNProfilePackage.LANE__CHILD_LANE_SET:
-				setChildLaneSet((LaneSet)newValue);
-				return;
-			case BPMNProfilePackage.LANE__LANE_SET:
-				setLaneSet((LaneSet)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -560,12 +442,6 @@ public class LaneImpl extends BaseElementImpl implements Lane {
 			case BPMNProfilePackage.LANE__PARTITION_ELEMENT_REF:
 				setPartitionElementRef((BaseElement)null);
 				return;
-			case BPMNProfilePackage.LANE__CHILD_LANE_SET:
-				setChildLaneSet((LaneSet)null);
-				return;
-			case BPMNProfilePackage.LANE__LANE_SET:
-				setLaneSet((LaneSet)null);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -587,9 +463,9 @@ public class LaneImpl extends BaseElementImpl implements Lane {
 			case BPMNProfilePackage.LANE__PARTITION_ELEMENT_REF:
 				return partitionElementRef != null;
 			case BPMNProfilePackage.LANE__CHILD_LANE_SET:
-				return childLaneSet != null;
+				return basicGetChildLaneSet() != null;
 			case BPMNProfilePackage.LANE__LANE_SET:
-				return laneSet != null;
+				return basicGetLaneSet() != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneSetImpl.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneSetImpl.java
index 4ff621eace8..7a8c61f78f2 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneSetImpl.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/LaneSetImpl.java
@@ -3,7 +3,6 @@
 package org.eclipse.papyrus.bpmn.BPMNProfile.impl;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
 import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -16,10 +15,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.EObjectValidator;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.papyrus.bpmn.BPMNProfile.BPMNProfilePackage;
 import org.eclipse.papyrus.bpmn.BPMNProfile.FlowElementsContainer;
 import org.eclipse.papyrus.bpmn.BPMNProfile.Lane;
@@ -55,24 +51,6 @@ public class LaneSetImpl extends BaseElementImpl implements LaneSet {
 	protected ActivityPartition base_ActivityPartition;
 
 	/**
-	 * The cached value of the '{@link #getLanes() <em>Lanes</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLanes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Lane> lanes;
-	/**
-	 * The cached value of the '{@link #getParentLane() <em>Parent Lane</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParentLane()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Lane> parentLane;
-	/**
 	 * The cached value of the '{@link #getFlowElementsContainer() <em>Flow Elements Container</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -142,25 +120,19 @@ public class LaneSetImpl extends BaseElementImpl implements LaneSet {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	public EList<Lane> getLanes() {
-		if (lanes == null) {
-			lanes = new EObjectWithInverseResolvingEList<Lane>(Lane.class, this, BPMNProfilePackage.LANE_SET__LANES, BPMNProfilePackage.LANE__LANE_SET);
-		}
-		return lanes;
+		return LaneSetCustom.getLanes(this);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	public EList<Lane> getParentLane() {
-		if (parentLane == null) {
-			parentLane = new EObjectResolvingEList<Lane>(Lane.class, this, BPMNProfilePackage.LANE_SET__PARENT_LANE);
-		}
-		return parentLane;
+		return LaneSetCustom.getParentLane(this);
 	}
 
 	/**
@@ -332,8 +304,6 @@ public class LaneSetImpl extends BaseElementImpl implements LaneSet {
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case BPMNProfilePackage.LANE_SET__LANES:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getLanes()).basicAdd(otherEnd, msgs);
 			case BPMNProfilePackage.LANE_SET__FLOW_ELEMENTS_CONTAINER:
 				if (flowElementsContainer != null)
 					msgs = ((InternalEObject)flowElementsContainer).eInverseRemove(this, BPMNProfilePackage.FLOW_ELEMENTS_CONTAINER__LANE_SETS, FlowElementsContainer.class, msgs);
@@ -350,8 +320,6 @@ public class LaneSetImpl extends BaseElementImpl implements LaneSet {
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case BPMNProfilePackage.LANE_SET__LANES:
-				return ((InternalEList<?>)getLanes()).basicRemove(otherEnd, msgs);
 			case BPMNProfilePackage.LANE_SET__FLOW_ELEMENTS_CONTAINER:
 				return basicSetFlowElementsContainer(null, msgs);
 		}
@@ -392,14 +360,6 @@ public class LaneSetImpl extends BaseElementImpl implements LaneSet {
 			case BPMNProfilePackage.LANE_SET__BASE_ACTIVITY_PARTITION:
 				setBase_ActivityPartition((ActivityPartition)newValue);
 				return;
-			case BPMNProfilePackage.LANE_SET__LANES:
-				getLanes().clear();
-				getLanes().addAll((Collection<? extends Lane>)newValue);
-				return;
-			case BPMNProfilePackage.LANE_SET__PARENT_LANE:
-				getParentLane().clear();
-				getParentLane().addAll((Collection<? extends Lane>)newValue);
-				return;
 			case BPMNProfilePackage.LANE_SET__FLOW_ELEMENTS_CONTAINER:
 				setFlowElementsContainer((FlowElementsContainer)newValue);
 				return;
@@ -418,12 +378,6 @@ public class LaneSetImpl extends BaseElementImpl implements LaneSet {
 			case BPMNProfilePackage.LANE_SET__BASE_ACTIVITY_PARTITION:
 				setBase_ActivityPartition((ActivityPartition)null);
 				return;
-			case BPMNProfilePackage.LANE_SET__LANES:
-				getLanes().clear();
-				return;
-			case BPMNProfilePackage.LANE_SET__PARENT_LANE:
-				getParentLane().clear();
-				return;
 			case BPMNProfilePackage.LANE_SET__FLOW_ELEMENTS_CONTAINER:
 				setFlowElementsContainer((FlowElementsContainer)null);
 				return;
@@ -442,9 +396,9 @@ public class LaneSetImpl extends BaseElementImpl implements LaneSet {
 			case BPMNProfilePackage.LANE_SET__BASE_ACTIVITY_PARTITION:
 				return base_ActivityPartition != null;
 			case BPMNProfilePackage.LANE_SET__LANES:
-				return lanes != null && !lanes.isEmpty();
+				return !getLanes().isEmpty();
 			case BPMNProfilePackage.LANE_SET__PARENT_LANE:
-				return parentLane != null && !parentLane.isEmpty();
+				return !getParentLane().isEmpty();
 			case BPMNProfilePackage.LANE_SET__FLOW_ELEMENTS_CONTAINER:
 				return flowElementsContainer != null;
 		}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/StandardLoopCharacteristicsImpl.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/StandardLoopCharacteristicsImpl.java
index ecd1c54c88d..06328dce6cf 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/StandardLoopCharacteristicsImpl.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/StandardLoopCharacteristicsImpl.java
@@ -79,26 +79,6 @@ public class StandardLoopCharacteristicsImpl extends LoopCharacteristicsImpl imp
 	protected static final boolean TEST_BEFORE_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isTestBefore() <em>Test Before</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isTestBefore()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean testBefore = TEST_BEFORE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getLoopCondition() <em>Loop Condition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLoopCondition()
-	 * @generated
-	 * @ordered
-	 */
-	protected BPMNExpression loopCondition;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -179,22 +159,10 @@ public class StandardLoopCharacteristicsImpl extends LoopCharacteristicsImpl imp
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	public boolean isTestBefore() {
-		return testBefore;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTestBefore(boolean newTestBefore) {
-		boolean oldTestBefore = testBefore;
-		testBefore = newTestBefore;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BPMNProfilePackage.STANDARD_LOOP_CHARACTERISTICS__TEST_BEFORE, oldTestBefore, testBefore));
+		return StandardLoopCharacteristicsCustom.isTestBefore(this);
 	}
 
 	/**
@@ -203,36 +171,17 @@ public class StandardLoopCharacteristicsImpl extends LoopCharacteristicsImpl imp
 	 * @generated
 	 */
 	public BPMNExpression getLoopCondition() {
-		if (loopCondition != null && loopCondition.eIsProxy()) {
-			InternalEObject oldLoopCondition = (InternalEObject)loopCondition;
-			loopCondition = (BPMNExpression)eResolveProxy(oldLoopCondition);
-			if (loopCondition != oldLoopCondition) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BPMNProfilePackage.STANDARD_LOOP_CHARACTERISTICS__LOOP_CONDITION, oldLoopCondition, loopCondition));
-			}
-		}
-		return loopCondition;
+		BPMNExpression loopCondition = basicGetLoopCondition();
+		return loopCondition != null && loopCondition.eIsProxy() ? (BPMNExpression)eResolveProxy((InternalEObject)loopCondition) : loopCondition;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	public BPMNExpression basicGetLoopCondition() {
-		return loopCondition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLoopCondition(BPMNExpression newLoopCondition) {
-		BPMNExpression oldLoopCondition = loopCondition;
-		loopCondition = newLoopCondition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BPMNProfilePackage.STANDARD_LOOP_CHARACTERISTICS__LOOP_CONDITION, oldLoopCondition, loopCondition));
+		return StandardLoopCharacteristicsCustom.basicGetLoopCondition(this);
 	}
 
 	/**
@@ -321,12 +270,6 @@ public class StandardLoopCharacteristicsImpl extends LoopCharacteristicsImpl imp
 			case BPMNProfilePackage.STANDARD_LOOP_CHARACTERISTICS__BASE_LOOP_NODE:
 				setBase_LoopNode((LoopNode)newValue);
 				return;
-			case BPMNProfilePackage.STANDARD_LOOP_CHARACTERISTICS__TEST_BEFORE:
-				setTestBefore((Boolean)newValue);
-				return;
-			case BPMNProfilePackage.STANDARD_LOOP_CHARACTERISTICS__LOOP_CONDITION:
-				setLoopCondition((BPMNExpression)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -345,12 +288,6 @@ public class StandardLoopCharacteristicsImpl extends LoopCharacteristicsImpl imp
 			case BPMNProfilePackage.STANDARD_LOOP_CHARACTERISTICS__BASE_LOOP_NODE:
 				setBase_LoopNode((LoopNode)null);
 				return;
-			case BPMNProfilePackage.STANDARD_LOOP_CHARACTERISTICS__TEST_BEFORE:
-				setTestBefore(TEST_BEFORE_EDEFAULT);
-				return;
-			case BPMNProfilePackage.STANDARD_LOOP_CHARACTERISTICS__LOOP_CONDITION:
-				setLoopCondition((BPMNExpression)null);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -368,9 +305,9 @@ public class StandardLoopCharacteristicsImpl extends LoopCharacteristicsImpl imp
 			case BPMNProfilePackage.STANDARD_LOOP_CHARACTERISTICS__BASE_LOOP_NODE:
 				return base_LoopNode != null;
 			case BPMNProfilePackage.STANDARD_LOOP_CHARACTERISTICS__TEST_BEFORE:
-				return testBefore != TEST_BEFORE_EDEFAULT;
+				return isTestBefore() != TEST_BEFORE_EDEFAULT;
 			case BPMNProfilePackage.STANDARD_LOOP_CHARACTERISTICS__LOOP_CONDITION:
-				return loopCondition != null;
+				return basicGetLoopCondition() != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -404,8 +341,6 @@ public class StandardLoopCharacteristicsImpl extends LoopCharacteristicsImpl imp
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (loopMaximum: ");
 		result.append(loopMaximum);
-		result.append(", testBefore: ");
-		result.append(testBefore);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/SubProcessImpl.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/SubProcessImpl.java
index b34b7a0c2ad..fd3b26cd331 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/SubProcessImpl.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/src/org/eclipse/papyrus/bpmn/BPMNProfile/impl/SubProcessImpl.java
@@ -57,16 +57,6 @@ public class SubProcessImpl extends BPMNActivityImpl implements SubProcess {
 	protected EList<LaneSet> laneSets;
 
 	/**
-	 * The cached value of the '{@link #getFlowElements() <em>Flow Elements</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFlowElements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<FlowElement> flowElements;
-
-	/**
 	 * The default value of the '{@link #isTriggeredByEvent() <em>Triggered By Event</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -143,10 +133,9 @@ public class SubProcessImpl extends BPMNActivityImpl implements SubProcess {
 	 * @generated
 	 */
 	public EList<FlowElement> getFlowElements() {
-		if (flowElements == null) {
-			flowElements = new EObjectWithInverseResolvingEList<FlowElement>(FlowElement.class, this, BPMNProfilePackage.SUB_PROCESS__FLOW_ELEMENTS, BPMNProfilePackage.FLOW_ELEMENT__CONTAINER);
-		}
-		return flowElements;
+		// TODO: implement this method to return the 'Flow Elements' reference list
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
 	}
 
 	/**
@@ -256,8 +245,6 @@ public class SubProcessImpl extends BPMNActivityImpl implements SubProcess {
 		switch (featureID) {
 			case BPMNProfilePackage.SUB_PROCESS__LANE_SETS:
 				return ((InternalEList<InternalEObject>)(InternalEList<?>)getLaneSets()).basicAdd(otherEnd, msgs);
-			case BPMNProfilePackage.SUB_PROCESS__FLOW_ELEMENTS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getFlowElements()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -272,8 +259,6 @@ public class SubProcessImpl extends BPMNActivityImpl implements SubProcess {
 		switch (featureID) {
 			case BPMNProfilePackage.SUB_PROCESS__LANE_SETS:
 				return ((InternalEList<?>)getLaneSets()).basicRemove(otherEnd, msgs);
-			case BPMNProfilePackage.SUB_PROCESS__FLOW_ELEMENTS:
-				return ((InternalEList<?>)getFlowElements()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -314,10 +299,6 @@ public class SubProcessImpl extends BPMNActivityImpl implements SubProcess {
 				getLaneSets().clear();
 				getLaneSets().addAll((Collection<? extends LaneSet>)newValue);
 				return;
-			case BPMNProfilePackage.SUB_PROCESS__FLOW_ELEMENTS:
-				getFlowElements().clear();
-				getFlowElements().addAll((Collection<? extends FlowElement>)newValue);
-				return;
 			case BPMNProfilePackage.SUB_PROCESS__TRIGGERED_BY_EVENT:
 				setTriggeredByEvent((Boolean)newValue);
 				return;
@@ -343,9 +324,6 @@ public class SubProcessImpl extends BPMNActivityImpl implements SubProcess {
 			case BPMNProfilePackage.SUB_PROCESS__LANE_SETS:
 				getLaneSets().clear();
 				return;
-			case BPMNProfilePackage.SUB_PROCESS__FLOW_ELEMENTS:
-				getFlowElements().clear();
-				return;
 			case BPMNProfilePackage.SUB_PROCESS__TRIGGERED_BY_EVENT:
 				setTriggeredByEvent(TRIGGERED_BY_EVENT_EDEFAULT);
 				return;
@@ -370,7 +348,7 @@ public class SubProcessImpl extends BPMNActivityImpl implements SubProcess {
 			case BPMNProfilePackage.SUB_PROCESS__LANE_SETS:
 				return laneSets != null && !laneSets.isEmpty();
 			case BPMNProfilePackage.SUB_PROCESS__FLOW_ELEMENTS:
-				return flowElements != null && !flowElements.isEmpty();
+				return !getFlowElements().isEmpty();
 			case BPMNProfilePackage.SUB_PROCESS__TRIGGERED_BY_EVENT:
 				return triggeredByEvent != TRIGGERED_BY_EVENT_EDEFAULT;
 			case BPMNProfilePackage.SUB_PROCESS__BASE_STRUCTURED_ACTIVITY_NODE:
author	Géry Deloge	2017-01-26 13:49:06 +0000
committer	Gerrit Code Review @ Eclipse.org	2017-02-10 10:47:30 +0000
commit	2cbd9bda39f505f21db9ed6e4c0563599d55e474 (patch)
tree	d09f28b30c0b001352e4e8dd7ef15760b676fecf /extraplugins/bpmn/org.eclipse.papyrus.bpmn
parent	b70cc7fed9181951d58828dab215ae040a37f553 (diff)
download	org.eclipse.papyrus-2cbd9bda39f505f21db9ed6e4c0563599d55e474.tar.gz org.eclipse.papyrus-2cbd9bda39f505f21db9ed6e4c0563599d55e474.tar.xz org.eclipse.papyrus-2cbd9bda39f505f21db9ed6e4c0563599d55e474.zip