diff --git a/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore b/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore
index e4f4039b055f27fee38cb08f91f3bcec7309cedb..203e73e91791316a2d176c9dd427010076201400 100644
--- a/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore
+++ b/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore
@@ -1,6 +1,6 @@
 @Ecore(nsURI="http://descartes.tools/dni-adaptation-metamodel-3.1")
 @GenModel(modelDirectory="/tools.descartes.dni.adaptation/src", editDirectory="/tools.descartes.dni.adaptation/src",
-	editorDirectory="/tools.descartes.dni.adaptation/src", fileExtensions="dniap", prefix="DNIAP")
+	editorDirectory="/tools.descartes.dni.adaptation/src", fileExtensions="dniap", prefix="DNIAP", suppressEMFTypes="true")
 package tools.descartes.dni.dnimm3ap
 
 //
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLink.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLink.java
index 18b4e2ff0102bcc960941e90f7565defe77cb478..1da2d830de02183cbd3bbdbb47aa70516759a965 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLink.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLink.java
@@ -2,8 +2,7 @@
  */
 package tools.descartes.dni.dnimm3ap;
 
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
 import tools.descartes.dni.dnimm3.LinkType;
 
 /**
@@ -56,7 +55,7 @@ public interface AdaptableLink extends IAdaptableEntity<LinkType>, IAdaptableGro
 	 * @model
 	 * @generated
 	 */
-	EList<AdaptableLinkPerformance> getLinkPerformance();
+	List<AdaptableLinkPerformance> getLinkPerformance();
 
 	/**
 	 * Returns the value of the '<em><b>Network Interface</b></em>' reference list.
@@ -72,7 +71,7 @@ public interface AdaptableLink extends IAdaptableEntity<LinkType>, IAdaptableGro
 	 * @model
 	 * @generated
 	 */
-	EList<AdaptableNetworkInterface> getNetworkInterface();
+	List<AdaptableNetworkInterface> getNetworkInterface();
 
 	/**
 	 * Returns the value of the '<em><b>Adaptation Group</b></em>' reference.
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterface.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterface.java
index 192cd04fefc66d97d6fbc0fc419bfa89cd87c9ef..b4a1b7c51939fd9ec39ca94b0a76971e7d07d98c 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterface.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterface.java
@@ -2,8 +2,7 @@
  */
 package tools.descartes.dni.dnimm3ap;
 
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
 import tools.descartes.dni.dnimm3.NetworkInterfaceType;
 
 /**
@@ -54,6 +53,6 @@ public interface AdaptableNetworkInterface extends IAdaptableEntity<NetworkInter
 	 * @model
 	 * @generated
 	 */
-	EList<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformance();
+	List<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformance();
 
 } // AdaptableNetworkInterface
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNode.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNode.java
index 79eb436d962e18d758b47c5b76dab353a3f9a8d7..6db9674719c7e2f79b1e5c26a7e6d0b2cb7d12c9 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNode.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNode.java
@@ -2,8 +2,7 @@
  */
 package tools.descartes.dni.dnimm3ap;
 
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
 import tools.descartes.dni.dnimm3.NodeType;
 
 /**
@@ -58,7 +57,7 @@ public interface AdaptableNode extends IAdaptableEntity<NodeType>, IAdaptableGro
 	 * @model
 	 * @generated
 	 */
-	EList<AdaptableEndPerformance> getEndPerformance();
+	List<AdaptableEndPerformance> getEndPerformance();
 
 	/**
 	 * Returns the value of the '<em><b>Intermediate Performance</b></em>' reference list.
@@ -74,7 +73,7 @@ public interface AdaptableNode extends IAdaptableEntity<NodeType>, IAdaptableGro
 	 * @model
 	 * @generated
 	 */
-	EList<AdaptableIntermediatePerformance> getIntermediatePerformance();
+	List<AdaptableIntermediatePerformance> getIntermediatePerformance();
 
 	/**
 	 * Returns the value of the '<em><b>Sdn Node Performance</b></em>' reference list.
@@ -90,7 +89,7 @@ public interface AdaptableNode extends IAdaptableEntity<NodeType>, IAdaptableGro
 	 * @model
 	 * @generated
 	 */
-	EList<AdaptableSdnNodePerformance> getSdnNodePerformance();
+	List<AdaptableSdnNodePerformance> getSdnNodePerformance();
 
 	/**
 	 * Returns the value of the '<em><b>Network Interface</b></em>' reference list.
@@ -106,7 +105,7 @@ public interface AdaptableNode extends IAdaptableEntity<NodeType>, IAdaptableGro
 	 * @model
 	 * @generated
 	 */
-	EList<AdaptableNetworkInterface> getNetworkInterface();
+	List<AdaptableNetworkInterface> getNetworkInterface();
 
 	/**
 	 * Returns the value of the '<em><b>Adaptation Group</b></em>' reference.
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformance.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformance.java
index e3e4a4c11a04ea04e2f757708909f93f24e8b14e..485f07f346a1f83685478c6942f68f1efd71b942 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformance.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformance.java
@@ -2,8 +2,7 @@
  */
 package tools.descartes.dni.dnimm3ap;
 
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
 import tools.descartes.dni.dnimm3.SdnNodePerformanceType;
 
 /**
@@ -55,7 +54,7 @@ public interface AdaptableSdnNodePerformance extends IAdaptableEntity<SdnNodePer
 	 * @model
 	 * @generated
 	 */
-	EList<AdaptableIntermediatePerformance> getSoftwareSwitchingPerformance();
+	List<AdaptableIntermediatePerformance> getSoftwareSwitchingPerformance();
 
 	/**
 	 * Returns the value of the '<em><b>Hardware Switching Performance</b></em>' reference list.
@@ -71,6 +70,6 @@ public interface AdaptableSdnNodePerformance extends IAdaptableEntity<SdnNodePer
 	 * @model
 	 * @generated
 	 */
-	EList<AdaptableIntermediatePerformance> getHardwareSwitchingPerformance();
+	List<AdaptableIntermediatePerformance> getHardwareSwitchingPerformance();
 
 } // AdaptableSdnNodePerformance
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationGroups.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationGroups.java
index cacb85230cbe0eb2d2a0c27d6cc92b2a403636fb..a47f18fe93286536f6a7499ca52b476a9736eefd 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationGroups.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationGroups.java
@@ -2,8 +2,7 @@
  */
 package tools.descartes.dni.dnimm3ap;
 
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -38,7 +37,7 @@ public interface AdaptationGroups extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<NodeAdaptationGroup> getNodes();
+	List<NodeAdaptationGroup> getNodes();
 
 	/**
 	 * Returns the value of the '<em><b>Links</b></em>' containment reference list.
@@ -54,6 +53,6 @@ public interface AdaptationGroups extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<LinkAdaptationGroup> getLinks();
+	List<LinkAdaptationGroup> getLinks();
 
 } // AdaptationGroups
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationRepositories.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationRepositories.java
index 9c7d46bf0aad9f5706ca146a87a04387ccc5df08..0edbded9b0ef7e511e51aa9f766630b887df089c 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationRepositories.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationRepositories.java
@@ -2,8 +2,7 @@
  */
 package tools.descartes.dni.dnimm3ap;
 
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -44,7 +43,7 @@ public interface AdaptationRepositories extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<AdaptableNode> getNodes();
+	List<AdaptableNode> getNodes();
 
 	/**
 	 * Returns the value of the '<em><b>End Performances</b></em>' containment reference list.
@@ -60,7 +59,7 @@ public interface AdaptationRepositories extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<AdaptableEndPerformance> getEndPerformances();
+	List<AdaptableEndPerformance> getEndPerformances();
 
 	/**
 	 * Returns the value of the '<em><b>Intermediate Performances</b></em>' containment reference list.
@@ -76,7 +75,7 @@ public interface AdaptationRepositories extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<AdaptableIntermediatePerformance> getIntermediatePerformances();
+	List<AdaptableIntermediatePerformance> getIntermediatePerformances();
 
 	/**
 	 * Returns the value of the '<em><b>Sdn Node Performances</b></em>' containment reference list.
@@ -92,7 +91,7 @@ public interface AdaptationRepositories extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<AdaptableSdnNodePerformance> getSdnNodePerformances();
+	List<AdaptableSdnNodePerformance> getSdnNodePerformances();
 
 	/**
 	 * Returns the value of the '<em><b>Network Interfaces</b></em>' containment reference list.
@@ -108,7 +107,7 @@ public interface AdaptationRepositories extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<AdaptableNetworkInterface> getNetworkInterfaces();
+	List<AdaptableNetworkInterface> getNetworkInterfaces();
 
 	/**
 	 * Returns the value of the '<em><b>Network Interface Performances</b></em>' containment reference list.
@@ -124,7 +123,7 @@ public interface AdaptationRepositories extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformances();
+	List<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformances();
 
 	/**
 	 * Returns the value of the '<em><b>Links</b></em>' containment reference list.
@@ -140,7 +139,7 @@ public interface AdaptationRepositories extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<AdaptableLink> getLinks();
+	List<AdaptableLink> getLinks();
 
 	/**
 	 * Returns the value of the '<em><b>Link Performances</b></em>' containment reference list.
@@ -156,6 +155,6 @@ public interface AdaptationRepositories extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<AdaptableLinkPerformance> getLinkPerformances();
+	List<AdaptableLinkPerformance> getLinkPerformances();
 
 } // AdaptationRepositories
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeParameterSet.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeParameterSet.java
index e73ddfe6bcf3f74d5f22d56a4c14423176c0a228..20ae3940f86747c8f2edab047416ec53adb2214c 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeParameterSet.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeParameterSet.java
@@ -2,8 +2,7 @@
  */
 package tools.descartes.dni.dnimm3ap;
 
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -36,6 +35,6 @@ public interface AlternativeParameterSet<P> extends EObject {
 	 * @model kind="reference" containment="true"
 	 * @generated
 	 */
-	EList<P> getAlternative();
+	List<P> getAlternative();
 
 } // AlternativeParameterSet
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/DNIAPPackage.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/DNIAPPackage.java
index 6372f150ccf6a87dc0cf639f3a26698fef985dc4..5eee04776eeed549d8a8b516ad62e4c67bdd462f 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/DNIAPPackage.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/DNIAPPackage.java
@@ -23,7 +23,7 @@ import tools.descartes.dni.dnimm3.DNIPackage;
  * <!-- end-user-doc -->
  * @see tools.descartes.dni.dnimm3ap.DNIAPFactory
  * @model kind="package"
- *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/tools.descartes.dni.adaptation/src' editDirectory='/tools.descartes.dni.adaptation/src' editorDirectory='/tools.descartes.dni.adaptation/src' fileExtensions='dniap' prefix='DNIAP' basePackage='tools.descartes.dni'"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/tools.descartes.dni.adaptation/src' editDirectory='/tools.descartes.dni.adaptation/src' editorDirectory='/tools.descartes.dni.adaptation/src' fileExtensions='dniap' prefix='DNIAP' suppressEMFTypes='true' basePackage='tools.descartes.dni'"
  * @generated
  */
 public interface DNIAPPackage extends EPackage {
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/LinkAdaptationGroup.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/LinkAdaptationGroup.java
index 6d5fb042fe3ebf4cc2cde275703fcc285ed3513d..4639d5415c40b40c3246b97f8f9ca8ad09239e09 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/LinkAdaptationGroup.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/LinkAdaptationGroup.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3ap;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface LinkAdaptationGroup extends IAdaptationGroup {
 	 * @model opposite="adaptationGroup"
 	 * @generated
 	 */
-	EList<AdaptableLink> getItems();
+	List<AdaptableLink> getItems();
 
 } // LinkAdaptationGroup
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/NodeAdaptationGroup.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/NodeAdaptationGroup.java
index df73a0739c4dc6c39a1449cf7f3135c193444ccc..1b27be48b98717b9b2068f5d5c5cd012e22deba9 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/NodeAdaptationGroup.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/NodeAdaptationGroup.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3ap;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface NodeAdaptationGroup extends IAdaptationGroup {
 	 * @model opposite="adaptationGroup"
 	 * @generated
 	 */
-	EList<AdaptableNode> getItems();
+	List<AdaptableNode> getItems();
 
 } // NodeAdaptationGroup
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkImpl.java
index 0cddc622c42e50de41bea37bf6e9c25e679262e2..7762c9d6b72b02f68606132e88eeb54c36fcf375 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -171,7 +172,7 @@ public class AdaptableLinkImpl extends MinimalEObjectImpl.Container implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableLinkPerformance> getLinkPerformance() {
+	public List<AdaptableLinkPerformance> getLinkPerformance() {
 		if (linkPerformance == null) {
 			linkPerformance = new EObjectResolvingEList<AdaptableLinkPerformance>(AdaptableLinkPerformance.class, this, DNIAPPackage.ADAPTABLE_LINK__LINK_PERFORMANCE);
 		}
@@ -183,7 +184,7 @@ public class AdaptableLinkImpl extends MinimalEObjectImpl.Container implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableNetworkInterface> getNetworkInterface() {
+	public List<AdaptableNetworkInterface> getNetworkInterface() {
 		if (networkInterface == null) {
 			networkInterface = new EObjectResolvingEList<AdaptableNetworkInterface>(AdaptableNetworkInterface.class, this, DNIAPPackage.ADAPTABLE_LINK__NETWORK_INTERFACE);
 		}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceImpl.java
index ecca8e0efb82753636152e753ed2f08f174c102f..db78d7e98f8ccf5514686354a66d97324e0a8cf6 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.common.util.EList;
@@ -146,7 +147,7 @@ public class AdaptableNetworkInterfaceImpl extends MinimalEObjectImpl.Container
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformance() {
+	public List<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformance() {
 		if (networkInterfacePerformance == null) {
 			networkInterfacePerformance = new EObjectResolvingEList<AdaptableNetworkInterfacePerformance>(AdaptableNetworkInterfacePerformance.class, this, DNIAPPackage.ADAPTABLE_NETWORK_INTERFACE__NETWORK_INTERFACE_PERFORMANCE);
 		}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeImpl.java
index 033ca0c6348ab2b13424e85d708a116f8390bd76..e7e0a4bc164630f03210c78d13c270ddaa3a484b 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -195,7 +196,7 @@ public class AdaptableNodeImpl extends MinimalEObjectImpl.Container implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableEndPerformance> getEndPerformance() {
+	public List<AdaptableEndPerformance> getEndPerformance() {
 		if (endPerformance == null) {
 			endPerformance = new EObjectResolvingEList<AdaptableEndPerformance>(AdaptableEndPerformance.class, this, DNIAPPackage.ADAPTABLE_NODE__END_PERFORMANCE);
 		}
@@ -207,7 +208,7 @@ public class AdaptableNodeImpl extends MinimalEObjectImpl.Container implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableIntermediatePerformance> getIntermediatePerformance() {
+	public List<AdaptableIntermediatePerformance> getIntermediatePerformance() {
 		if (intermediatePerformance == null) {
 			intermediatePerformance = new EObjectResolvingEList<AdaptableIntermediatePerformance>(AdaptableIntermediatePerformance.class, this, DNIAPPackage.ADAPTABLE_NODE__INTERMEDIATE_PERFORMANCE);
 		}
@@ -219,7 +220,7 @@ public class AdaptableNodeImpl extends MinimalEObjectImpl.Container implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableSdnNodePerformance> getSdnNodePerformance() {
+	public List<AdaptableSdnNodePerformance> getSdnNodePerformance() {
 		if (sdnNodePerformance == null) {
 			sdnNodePerformance = new EObjectResolvingEList<AdaptableSdnNodePerformance>(AdaptableSdnNodePerformance.class, this, DNIAPPackage.ADAPTABLE_NODE__SDN_NODE_PERFORMANCE);
 		}
@@ -231,7 +232,7 @@ public class AdaptableNodeImpl extends MinimalEObjectImpl.Container implements A
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableNetworkInterface> getNetworkInterface() {
+	public List<AdaptableNetworkInterface> getNetworkInterface() {
 		if (networkInterface == null) {
 			networkInterface = new EObjectResolvingEList<AdaptableNetworkInterface>(AdaptableNetworkInterface.class, this, DNIAPPackage.ADAPTABLE_NODE__NETWORK_INTERFACE);
 		}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceImpl.java
index cb540eb2405673cc8c7150dcc3c5117226f1a65e..210835a73fbd7e202272f7e9d59ba93c7dfce3a0 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.common.util.EList;
@@ -157,7 +158,7 @@ public class AdaptableSdnNodePerformanceImpl extends MinimalEObjectImpl.Containe
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableIntermediatePerformance> getSoftwareSwitchingPerformance() {
+	public List<AdaptableIntermediatePerformance> getSoftwareSwitchingPerformance() {
 		if (softwareSwitchingPerformance == null) {
 			softwareSwitchingPerformance = new EObjectResolvingEList<AdaptableIntermediatePerformance>(AdaptableIntermediatePerformance.class, this, DNIAPPackage.ADAPTABLE_SDN_NODE_PERFORMANCE__SOFTWARE_SWITCHING_PERFORMANCE);
 		}
@@ -169,7 +170,7 @@ public class AdaptableSdnNodePerformanceImpl extends MinimalEObjectImpl.Containe
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableIntermediatePerformance> getHardwareSwitchingPerformance() {
+	public List<AdaptableIntermediatePerformance> getHardwareSwitchingPerformance() {
 		if (hardwareSwitchingPerformance == null) {
 			hardwareSwitchingPerformance = new EObjectResolvingEList<AdaptableIntermediatePerformance>(AdaptableIntermediatePerformance.class, this, DNIAPPackage.ADAPTABLE_SDN_NODE_PERFORMANCE__HARDWARE_SWITCHING_PERFORMANCE);
 		}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationGroupsImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationGroupsImpl.java
index d0886fdc8594492ac8aa123857649e949605bfe6..0ea709caa985b2bdd5fde259f60aaca7a89b44e4 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationGroupsImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationGroupsImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -80,7 +81,7 @@ public class AdaptationGroupsImpl extends MinimalEObjectImpl.Container implement
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<NodeAdaptationGroup> getNodes() {
+	public List<NodeAdaptationGroup> getNodes() {
 		if (nodes == null) {
 			nodes = new EObjectContainmentEList<NodeAdaptationGroup>(NodeAdaptationGroup.class, this, DNIAPPackage.ADAPTATION_GROUPS__NODES);
 		}
@@ -92,7 +93,7 @@ public class AdaptationGroupsImpl extends MinimalEObjectImpl.Container implement
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<LinkAdaptationGroup> getLinks() {
+	public List<LinkAdaptationGroup> getLinks() {
 		if (links == null) {
 			links = new EObjectContainmentEList<LinkAdaptationGroup>(LinkAdaptationGroup.class, this, DNIAPPackage.ADAPTATION_GROUPS__LINKS);
 		}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationRepositoriesImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationRepositoriesImpl.java
index b607f7fba950ebd1aa3a2e73e89b822f0d1da946..b40748cb4f6480194ee2823dba649e37302632a0 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationRepositoriesImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationRepositoriesImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -152,7 +153,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableNode> getNodes() {
+	public List<AdaptableNode> getNodes() {
 		if (nodes == null) {
 			nodes = new EObjectContainmentEList<AdaptableNode>(AdaptableNode.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__NODES);
 		}
@@ -164,7 +165,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableEndPerformance> getEndPerformances() {
+	public List<AdaptableEndPerformance> getEndPerformances() {
 		if (endPerformances == null) {
 			endPerformances = new EObjectContainmentEList<AdaptableEndPerformance>(AdaptableEndPerformance.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__END_PERFORMANCES);
 		}
@@ -176,7 +177,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableIntermediatePerformance> getIntermediatePerformances() {
+	public List<AdaptableIntermediatePerformance> getIntermediatePerformances() {
 		if (intermediatePerformances == null) {
 			intermediatePerformances = new EObjectContainmentEList<AdaptableIntermediatePerformance>(AdaptableIntermediatePerformance.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__INTERMEDIATE_PERFORMANCES);
 		}
@@ -188,7 +189,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableSdnNodePerformance> getSdnNodePerformances() {
+	public List<AdaptableSdnNodePerformance> getSdnNodePerformances() {
 		if (sdnNodePerformances == null) {
 			sdnNodePerformances = new EObjectContainmentEList<AdaptableSdnNodePerformance>(AdaptableSdnNodePerformance.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__SDN_NODE_PERFORMANCES);
 		}
@@ -200,7 +201,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableNetworkInterface> getNetworkInterfaces() {
+	public List<AdaptableNetworkInterface> getNetworkInterfaces() {
 		if (networkInterfaces == null) {
 			networkInterfaces = new EObjectContainmentEList<AdaptableNetworkInterface>(AdaptableNetworkInterface.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__NETWORK_INTERFACES);
 		}
@@ -212,7 +213,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformances() {
+	public List<AdaptableNetworkInterfacePerformance> getNetworkInterfacePerformances() {
 		if (networkInterfacePerformances == null) {
 			networkInterfacePerformances = new EObjectContainmentEList<AdaptableNetworkInterfacePerformance>(AdaptableNetworkInterfacePerformance.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__NETWORK_INTERFACE_PERFORMANCES);
 		}
@@ -224,7 +225,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableLink> getLinks() {
+	public List<AdaptableLink> getLinks() {
 		if (links == null) {
 			links = new EObjectContainmentEList<AdaptableLink>(AdaptableLink.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__LINKS);
 		}
@@ -236,7 +237,7 @@ public class AdaptationRepositoriesImpl extends MinimalEObjectImpl.Container imp
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableLinkPerformance> getLinkPerformances() {
+	public List<AdaptableLinkPerformance> getLinkPerformances() {
 		if (linkPerformances == null) {
 			linkPerformances = new EObjectContainmentEList<AdaptableLinkPerformance>(AdaptableLinkPerformance.class, this, DNIAPPackage.ADAPTATION_REPOSITORIES__LINK_PERFORMANCES);
 		}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongVariableSetImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongVariableSetImpl.java
index 1d2db3fd65778b1c83c11f77e26fd6beb8541b56..cc82de235eb15ae0017e3b500ecd97df0cec3701 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongVariableSetImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongVariableSetImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -68,7 +69,7 @@ public class AlternativeConstantLongVariableSetImpl extends AlternativeConstantL
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<ConstantLongVariable> getAlternative() {
+	public List<ConstantLongVariable> getAlternative() {
 		if (alternative == null) {
 			alternative = new EObjectContainmentEList<ConstantLongVariable>(ConstantLongVariable.class, this, DNIAPPackage.ALTERNATIVE_CONSTANT_LONG_VARIABLE_SET__ALTERNATIVE);
 		}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableSetImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableSetImpl.java
index 6d0d46832d061cf93c6651e309f3e2646933a615..4e9c13fa78804e10e88de5e7b835ebe672ac7870 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableSetImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableSetImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -68,7 +69,7 @@ public class AlternativeVariableSetImpl extends AlternativeVariableImpl implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<Variable> getAlternative() {
+	public List<Variable> getAlternative() {
 		if (alternative == null) {
 			alternative = new EObjectContainmentEList<Variable>(Variable.class, this, DNIAPPackage.ALTERNATIVE_VARIABLE_SET__ALTERNATIVE);
 		}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/LinkAdaptationGroupImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/LinkAdaptationGroupImpl.java
index aeb52b28f9b4094fd51d9e35d9fce232648e61c5..19851e8dc95f3983bdb9fcdeffeb92a1014105a0 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/LinkAdaptationGroupImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/LinkAdaptationGroupImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -256,7 +257,7 @@ public class LinkAdaptationGroupImpl extends MinimalEObjectImpl.Container implem
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableLink> getItems() {
+	public List<AdaptableLink> getItems() {
 		if (items == null) {
 			items = new EObjectWithInverseResolvingEList<AdaptableLink>(AdaptableLink.class, this, DNIAPPackage.LINK_ADAPTATION_GROUP__ITEMS, DNIAPPackage.ADAPTABLE_LINK__ADAPTATION_GROUP);
 		}
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/NodeAdaptationGroupImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/NodeAdaptationGroupImpl.java
index 2e817c004146566c5340be44faf5e9faf834905a..b978a654c3770e53086501b67bcca59983bec99a 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/NodeAdaptationGroupImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/NodeAdaptationGroupImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3ap.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -256,7 +257,7 @@ public class NodeAdaptationGroupImpl extends MinimalEObjectImpl.Container implem
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AdaptableNode> getItems() {
+	public List<AdaptableNode> getItems() {
 		if (items == null) {
 			items = new EObjectWithInverseResolvingEList<AdaptableNode>(AdaptableNode.class, this, DNIAPPackage.NODE_ADAPTATION_GROUP__ITEMS, DNIAPPackage.ADAPTABLE_NODE__ADAPTATION_GROUP);
 		}
diff --git a/tools.descartes.dni.core/model/DNIMM3.xcore b/tools.descartes.dni.core/model/DNIMM3.xcore
index b5d9a87836a135c28038bb3cefea52162d6e01ac..39440a715ca49dd5966f3fdd3ac007b3b819e1b5 100644
--- a/tools.descartes.dni.core/model/DNIMM3.xcore
+++ b/tools.descartes.dni.core/model/DNIMM3.xcore
@@ -3,7 +3,7 @@
 	settingDelegates="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
 	validationDelegates="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot")
 @GenModel(modelDirectory="/tools.descartes.dni.core/src", editDirectory="/tools.descartes.dni.core/src",
-	editorDirectory="/tools.descartes.dni.core/src", fileExtensions="dni", prefix="DNI")
+	editorDirectory="/tools.descartes.dni.core/src", fileExtensions="dni", prefix="DNI", suppressEMFTypes="true")
 package tools.descartes.dni.dnimm3
 
 import org.eclipse.emf.ecore.util.EcoreUtil
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/AddressableEntity.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/AddressableEntity.java
index 857cd5489db687520bb81ac1b05dca940f0dbea2..5e00c53aed99266b5c0591a4902265c2420efb88 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/AddressableEntity.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/AddressableEntity.java
@@ -2,8 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -37,6 +36,6 @@ public interface AddressableEntity extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<EntityAddress> getAddresses();
+	List<EntityAddress> getAddresses();
 
 } // AddressableEntity
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/BranchAction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/BranchAction.java
index bf5d933bb21c7ba1f6d01fd902141a8703459120..9ec3261b8bf53370552dcdb99a3684ed45c00c8f 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/BranchAction.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/BranchAction.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,6 +35,6 @@ public interface BranchAction extends AbstractAction {
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
-	EList<AbstractAction> getIntern();
+	List<AbstractAction> getIntern();
 
 } // BranchAction
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/CommunicatingApplication.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/CommunicatingApplication.java
index 8f6d1702183d8ef6e29fc40851c83295ef1cf37c..81be28eedf589af2bd5aae8748c8e6add8a75d6f 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/CommunicatingApplication.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/CommunicatingApplication.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -38,7 +38,7 @@ public interface CommunicatingApplication extends Entity {
 	 * @model opposite="softwareComponent" containment="true"
 	 * @generated
 	 */
-	EList<TrafficSource> getTrafficSources();
+	List<TrafficSource> getTrafficSources();
 
 	/**
 	 * Returns the value of the '<em><b>Deployed On</b></em>' reference.
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIPackage.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIPackage.java
index 56bfef335e7a258d3489075f45487c11203c8f17..b75ec4670aab299fbe59e1a918f5af37c146802e 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIPackage.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIPackage.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EReference;
  * <!-- end-user-doc -->
  * @see tools.descartes.dni.dnimm3.DNIFactory
  * @model kind="package"
- *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/tools.descartes.dni.core/src' editDirectory='/tools.descartes.dni.core/src' editorDirectory='/tools.descartes.dni.core/src' fileExtensions='dni' prefix='DNI' basePackage='tools.descartes.dni'"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/tools.descartes.dni.core/src' editDirectory='/tools.descartes.dni.core/src' editorDirectory='/tools.descartes.dni.core/src' fileExtensions='dni' prefix='DNI' suppressEMFTypes='true' basePackage='tools.descartes.dni'"
  *        annotation="http://www.eclipse.org/emf/2011/Xcore Pivot='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"
  * @generated
  */
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DiscreteFunction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DiscreteFunction.java
index 394be36014185d01e416412a264a58751386d5e9..fb9a8f5f457d952936717effa1bda8fabe6034aa 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DiscreteFunction.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DiscreteFunction.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,6 +35,6 @@ public interface DiscreteFunction extends Function {
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
-	EList<FloatCoordinate> getVals();
+	List<FloatCoordinate> getVals();
 
 } // DiscreteFunction
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/End.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/End.java
index 92d01d7b837363517a16be773ab6be1a1cf736f7..35f61e502bb27662ccebb3b4a25d63020d7fe61b 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/End.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/End.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -66,7 +66,7 @@ public interface End extends Identifier {
 	 * @model opposite="deployedOn"
 	 * @generated
 	 */
-	EList<CommunicatingApplication> getSoftware();
+	List<CommunicatingApplication> getSoftware();
 
 	/**
 	 * Returns the value of the '<em><b>Node</b></em>' container reference.
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EndPerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EndPerformanceType.java
index 6e407f733202bd5b93fbde04856c2afe4959f325..deb82ca51cfed8402d315c114b6a3335656c0421 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EndPerformanceType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EndPerformanceType.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface EndPerformanceType extends ITypedEntity {
 	 * @model opposite="entityType"
 	 * @generated
 	 */
-	EList<EndPerformance> getEntities();
+	List<EndPerformance> getEntities();
 
 } // EndPerformanceType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EntityTypes.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EntityTypes.java
index 97342324c5a898349aacb1a9f387dfe259e78abf..d209a405c950e4ceca2199677ed0887cdd93195a 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EntityTypes.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EntityTypes.java
@@ -2,8 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -37,6 +36,6 @@ public interface EntityTypes extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<ITypedEntity> getTypes();
+	List<ITypedEntity> getTypes();
 
 } // EntityTypes
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Flow.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Flow.java
index 1cb7b47b5de8ad20e8c24e0dadceac58892715a1..cb2f1a692608cc7f987f84bc7adeb6e4a13bb9a6 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Flow.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Flow.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -66,7 +66,7 @@ public interface Flow extends Entity {
 	 * @model opposite="flow" containment="true"
 	 * @generated
 	 */
-	EList<FlowTraffic> getGeneratedTraffic();
+	List<FlowTraffic> getGeneratedTraffic();
 
 	/**
 	 * Returns the value of the '<em><b>Destination Software</b></em>' reference list.
@@ -82,7 +82,7 @@ public interface Flow extends Entity {
 	 * @model required="true"
 	 * @generated
 	 */
-	EList<CommunicatingApplication> getDestinationSoftware();
+	List<CommunicatingApplication> getDestinationSoftware();
 
 	/**
 	 * Returns the value of the '<em><b>Destination Addresses</b></em>' containment reference list.
@@ -98,6 +98,6 @@ public interface Flow extends Entity {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<EntityAddress> getDestinationAddresses();
+	List<EntityAddress> getDestinationAddresses();
 
 } // Flow
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/GenericWorkload.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/GenericWorkload.java
index c5b4f69a9aeb21a0b431943ee88253f27dfce8c5..aaaec61a56e90ea95c2c1775d82f77ebc4158b26 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/GenericWorkload.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/GenericWorkload.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,6 +35,6 @@ public interface GenericWorkload extends Workload {
 	 * @model containment="true" ordered="false"
 	 * @generated
 	 */
-	EList<AbstractAction> getActions();
+	List<AbstractAction> getActions();
 
 } // GenericWorkload
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/IntermediatePerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/IntermediatePerformanceType.java
index 1eaef5e36b6a6587d973cb993ae34a75c3ed7d52..2ef11d903b617d799186aeec91d9c566ff562668 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/IntermediatePerformanceType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/IntermediatePerformanceType.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface IntermediatePerformanceType extends ITypedEntity {
 	 * @model opposite="entityType"
 	 * @generated
 	 */
-	EList<IntermediatePerformance> getEntities();
+	List<IntermediatePerformance> getEntities();
 
 } // IntermediatePerformanceType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Link.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Link.java
index 6423b977223d85a5dee52e636d7fbe67e5f55136..2b90c05b381cd56eb99bfb42f686bda2d1eae6c2 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Link.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Link.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -38,7 +38,7 @@ public interface Link extends Entity {
 	 * @model lower="2" upper="2"
 	 * @generated
 	 */
-	EList<NetworkInterface> getConnects();
+	List<NetworkInterface> getConnects();
 
 	/**
 	 * Returns the value of the '<em><b>Performance</b></em>' containment reference.
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkPerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkPerformanceType.java
index 0869b28085fbcb016f6a90e544bf62b71b3d1447..fe4c5ce600ed32885c93bc82017e6b937c5dfae0 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkPerformanceType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkPerformanceType.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface LinkPerformanceType extends ITypedEntity {
 	 * @model opposite="entityType"
 	 * @generated
 	 */
-	EList<PerformanceLink> getEntities();
+	List<PerformanceLink> getEntities();
 
 } // LinkPerformanceType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkType.java
index 197d850ecbb1a6eec1c4e2470b5449af28f7f79e..3f6339a841db0e4554c999ec43bd72459c6a6f87 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkType.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface LinkType extends ITypedEntity {
 	 * @model opposite="entityType"
 	 * @generated
 	 */
-	EList<Link> getEntities();
+	List<Link> getEntities();
 
 } // LinkType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkConfiguration.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkConfiguration.java
index d05c5770d7c53ff1676d427ce16237f3244f0783..ead65870423174ed4729e210f25c39df8b4b092c 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkConfiguration.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkConfiguration.java
@@ -2,8 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -91,6 +90,6 @@ public interface NetworkConfiguration extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<SdnFlowRule> getRules();
+	List<SdnFlowRule> getRules();
 
 } // NetworkConfiguration
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfacePerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfacePerformanceType.java
index eb155a6160db9c59c1c346d4bcbe8d2283a024cf..cdde37d04b894eb864a81c96810996d7f6674b78 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfacePerformanceType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfacePerformanceType.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface NetworkInterfacePerformanceType extends ITypedEntity {
 	 * @model opposite="entityType"
 	 * @generated
 	 */
-	EList<PerformanceNetworkInterface> getEntities();
+	List<PerformanceNetworkInterface> getEntities();
 
 } // NetworkInterfacePerformanceType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfaceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfaceType.java
index c79645a9e83b43a1de1065109c8d621b8f8a5d0e..6e55ae2df39ed39e594313f69a5fe84352a2534e 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfaceType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfaceType.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface NetworkInterfaceType extends ITypedEntity {
 	 * @model opposite="entityType"
 	 * @generated
 	 */
-	EList<NetworkInterface> getEntities();
+	List<NetworkInterface> getEntities();
 
 } // NetworkInterfaceType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkStructure.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkStructure.java
index 0934a6229646aeb0b3eb70938eb4943f46eff37a..05bf582d2ee3124bf451f641fcf4170988fdcec2 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkStructure.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkStructure.java
@@ -2,8 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -38,7 +37,7 @@ public interface NetworkStructure extends EObject {
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
-	EList<Node> getNodes();
+	List<Node> getNodes();
 
 	/**
 	 * Returns the value of the '<em><b>Links</b></em>' containment reference list.
@@ -54,6 +53,6 @@ public interface NetworkStructure extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<Link> getLinks();
+	List<Link> getLinks();
 
 } // NetworkStructure
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkTraffic.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkTraffic.java
index d94cc9a650c2e6c932d9c00f117f7aa14fd13aa2..45479b6a7c251e815a0041e921512c47c609f342 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkTraffic.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkTraffic.java
@@ -2,8 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -38,7 +37,7 @@ public interface NetworkTraffic extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<Flow> getFlows();
+	List<Flow> getFlows();
 
 	/**
 	 * Returns the value of the '<em><b>Software</b></em>' containment reference list.
@@ -54,6 +53,6 @@ public interface NetworkTraffic extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<CommunicatingApplication> getSoftware();
+	List<CommunicatingApplication> getSoftware();
 
 } // NetworkTraffic
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Node.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Node.java
index 431d1a0e6b4fdaced771f8cd476acfc2ce566442..b64939af5b060cd45f424a56255ff3b49d3e7edf 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Node.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Node.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -45,7 +45,7 @@ public interface Node extends Entity {
 	 * @model opposite="node" containment="true"
 	 * @generated
 	 */
-	EList<NetworkInterface> getInterfaces();
+	List<NetworkInterface> getInterfaces();
 
 	/**
 	 * Returns the value of the '<em><b>Sdntype</b></em>' containment reference.
@@ -159,7 +159,7 @@ public interface Node extends Entity {
 	 * @model opposite="isHostedOn"
 	 * @generated
 	 */
-	EList<Node> getHosts();
+	List<Node> getHosts();
 
 	/**
 	 * Returns the value of the '<em><b>Is Hosted On</b></em>' reference.
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NodeType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NodeType.java
index feaaebc19ee277dee802d9cd2a12dc028a6f4aa2..4f54bd3d6f5c129fd242097074371184b5f4173e 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NodeType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NodeType.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface NodeType extends ITypedEntity {
 	 * @model opposite="entityType"
 	 * @generated
 	 */
-	EList<Node> getEntities();
+	List<Node> getEntities();
 
 } // NodeType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolStack.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolStack.java
index c7e30044deb601fcddee0f97ddcc8f27b067da24..0148ea202ddc9a3e2f77b44e52c5b2188d5d4730 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolStack.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolStack.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,6 +35,6 @@ public interface ProtocolStack extends Entity {
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
-	EList<ProtocolLayer> getLayers();
+	List<ProtocolLayer> getLayers();
 
 } // ProtocolStack
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolsRepository.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolsRepository.java
index 8fdd8ed6761e6b7d3fb51b0f2a5c12895ee3a9f0..d9bf2c7ab200127ca859a08abd9436d32b2392cc 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolsRepository.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolsRepository.java
@@ -2,8 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -38,7 +37,7 @@ public interface ProtocolsRepository extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<ProtocolStack> getStacks();
+	List<ProtocolStack> getStacks();
 
 	/**
 	 * Returns the value of the '<em><b>Protocols</b></em>' containment reference list.
@@ -54,6 +53,6 @@ public interface ProtocolsRepository extends EObject {
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
-	EList<NetworkProtocol> getProtocols();
+	List<NetworkProtocol> getProtocols();
 
 } // ProtocolsRepository
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/RoutesRepository.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/RoutesRepository.java
index 52ab1bcd9e5438930d09cdc99a60ee5e50de33a0..a8487a3916c6eea4bc28d1fc4ca9bacb3504e1d2 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/RoutesRepository.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/RoutesRepository.java
@@ -2,8 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
-
+import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -39,7 +38,7 @@ public interface RoutesRepository extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<Route> getRoutes();
+	List<Route> getRoutes();
 
 	/**
 	 * Returns the value of the '<em><b>Flow Routes</b></em>' containment reference list.
@@ -55,7 +54,7 @@ public interface RoutesRepository extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<FlowRoute> getFlowRoutes();
+	List<FlowRoute> getFlowRoutes();
 
 	/**
 	 * Returns the value of the '<em><b>Directions</b></em>' containment reference list.
@@ -71,6 +70,6 @@ public interface RoutesRepository extends EObject {
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<Direction> getDirections();
+	List<Direction> getDirections();
 
 } // RoutesRepository
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SDN.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SDN.java
index 3c0cf8e4464c1c4683ca0a20ebb1adf9844d59dc..c6c4276c863774bd08dad7443a3f6de8fdb3b931 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SDN.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SDN.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -65,7 +65,7 @@ public interface SDN extends IType {
 	 * @model opposite="nodes" required="true"
 	 * @generated
 	 */
-	EList<SdnController> getController();
+	List<SdnController> getController();
 
 	/**
 	 * Returns the value of the '<em><b>Open Flow End Point</b></em>' reference.
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnController.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnController.java
index a4006d3dcb8bbe7624645621b76068c2d4ed0302..d684ab1b85f5b9b28df4a47274ab5a7cd89ae170 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnController.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnController.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -38,7 +38,7 @@ public interface SdnController extends CommunicatingApplication {
 	 * @model opposite="belongsTo" containment="true"
 	 * @generated
 	 */
-	EList<SdnControllerApplication> getApplications();
+	List<SdnControllerApplication> getApplications();
 
 	/**
 	 * Returns the value of the '<em><b>Nodes</b></em>' reference list.
@@ -56,6 +56,6 @@ public interface SdnController extends CommunicatingApplication {
 	 * @model opposite="controller"
 	 * @generated
 	 */
-	EList<SDN> getNodes();
+	List<SDN> getNodes();
 
 } // SdnController
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnNodePerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnNodePerformanceType.java
index 12de886cad14a32f5413042c3cbb4e969c48ad41..e2d4dfbe6a4cf82fe8b3af4d7edcf0c935d23500 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnNodePerformanceType.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnNodePerformanceType.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,6 +37,6 @@ public interface SdnNodePerformanceType extends ITypedEntity {
 	 * @model opposite="entityType"
 	 * @generated
 	 */
-	EList<PerformanceSdnNode> getEntities();
+	List<PerformanceSdnNode> getEntities();
 
 } // SdnNodePerformanceType
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SequenceAction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SequenceAction.java
index 104f2ea9bc4ee85822b54fe36797866d9803a324..3280b46dcf011fd56d6fcdb13fee616635a258cb 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SequenceAction.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SequenceAction.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,6 +35,6 @@ public interface SequenceAction extends AbstractAction {
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
-	EList<AbstractAction> getIntern();
+	List<AbstractAction> getIntern();
 
 } // SequenceAction
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/TrafficSource.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/TrafficSource.java
index 0df90258640dfa97c56b7204ba36c71d1e5a1dcd..37d8c60ffad5c759544b615bfaebfb43ea03d6b8 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/TrafficSource.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/TrafficSource.java
@@ -2,7 +2,7 @@
  */
 package tools.descartes.dni.dnimm3;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,7 +36,7 @@ public interface TrafficSource extends Entity, AddressableEntity {
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
-	EList<Workload> getWorkload();
+	List<Workload> getWorkload();
 
 	/**
 	 * Returns the value of the '<em><b>Software Component</b></em>' container reference.
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/BranchActionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/BranchActionImpl.java
index aae99e9431ac9c34908dcb24c7dbb8c5618c79b1..b7404fa9d91c7fc1c5feef92ba57c571249f7b1a 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/BranchActionImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/BranchActionImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -68,7 +69,7 @@ public class BranchActionImpl extends MinimalEObjectImpl.Container implements Br
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AbstractAction> getIntern() {
+	public List<AbstractAction> getIntern() {
 		if (intern == null) {
 			intern = new EObjectContainmentEList<AbstractAction>(AbstractAction.class, this, DNIPackage.BRANCH_ACTION__INTERN);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/CommunicatingApplicationImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/CommunicatingApplicationImpl.java
index 09e31a90ed5854a92d13fa3bff6bf3d56be035b4..bb68038f0efbd93f4238cf7bc89685a963ab9aae 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/CommunicatingApplicationImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/CommunicatingApplicationImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -166,7 +167,7 @@ public class CommunicatingApplicationImpl extends IdentifierImpl implements Comm
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<TrafficSource> getTrafficSources() {
+	public List<TrafficSource> getTrafficSources() {
 		if (trafficSources == null) {
 			trafficSources = new EObjectContainmentWithInverseEList<TrafficSource>(TrafficSource.class, this, DNIPackage.COMMUNICATING_APPLICATION__TRAFFIC_SOURCES, DNIPackage.TRAFFIC_SOURCE__SOFTWARE_COMPONENT);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DiscreteFunctionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DiscreteFunctionImpl.java
index c029f98e83a33d7b73e3eba4a6dec3287c9a5275..a9a4422debf3f95a14a28984dce1f0a89d87c296 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DiscreteFunctionImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DiscreteFunctionImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -125,7 +126,7 @@ public class DiscreteFunctionImpl extends MinimalEObjectImpl.Container implement
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<FloatCoordinate> getVals() {
+	public List<FloatCoordinate> getVals() {
 		if (vals == null) {
 			vals = new EObjectContainmentEList<FloatCoordinate>(FloatCoordinate.class, this, DNIPackage.DISCRETE_FUNCTION__VALS);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndImpl.java
index 11b8bb6f528df5d79862976c807721af7ba8d1e5..7fc2bfded0a5456d811c0a56c2001c2d9d21f5d0 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -138,7 +139,7 @@ public class EndImpl extends IdentifierImpl implements End {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<CommunicatingApplication> getSoftware() {
+	public List<CommunicatingApplication> getSoftware() {
 		if (software == null) {
 			software = new EObjectWithInverseResolvingEList<CommunicatingApplication>(CommunicatingApplication.class, this, DNIPackage.END__SOFTWARE, DNIPackage.COMMUNICATING_APPLICATION__DEPLOYED_ON);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndPerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndPerformanceTypeImpl.java
index 388baf6f097ed4a73d6175c525a1d5cd84e0fe56..abb72eb366f26ac3589a45961bfb486c1255db66 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndPerformanceTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndPerformanceTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -255,7 +256,7 @@ public class EndPerformanceTypeImpl extends MinimalEObjectImpl.Container impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<EndPerformance> getEntities() {
+	public List<EndPerformance> getEntities() {
 		if (entities == null) {
 			entities = new EObjectWithInverseResolvingEList<EndPerformance>(EndPerformance.class, this, DNIPackage.END_PERFORMANCE_TYPE__ENTITIES, DNIPackage.END_PERFORMANCE__ENTITY_TYPE);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EntityTypesImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EntityTypesImpl.java
index 1e729929d08df6cecd0a669b98331b6340716c2c..3e40830b680ec5a21c533ff5737743aa5b0cfd25 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EntityTypesImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EntityTypesImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -68,7 +69,7 @@ public class EntityTypesImpl extends MinimalEObjectImpl.Container implements Ent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<ITypedEntity> getTypes() {
+	public List<ITypedEntity> getTypes() {
 		if (types == null) {
 			types = new EObjectContainmentEList<ITypedEntity>(ITypedEntity.class, this, DNIPackage.ENTITY_TYPES__TYPES);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FlowImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FlowImpl.java
index 5417022278b71df8060f9bb18b8c78f1fba3c127..beca5e97e7192e09b6aaf3fbd1c5bbfffb529652 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FlowImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FlowImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -229,7 +230,7 @@ public class FlowImpl extends IdentifierImpl implements Flow {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<FlowTraffic> getGeneratedTraffic() {
+	public List<FlowTraffic> getGeneratedTraffic() {
 		if (generatedTraffic == null) {
 			generatedTraffic = new EObjectContainmentWithInverseEList<FlowTraffic>(FlowTraffic.class, this, DNIPackage.FLOW__GENERATED_TRAFFIC, DNIPackage.FLOW_TRAFFIC__FLOW);
 		}
@@ -241,7 +242,7 @@ public class FlowImpl extends IdentifierImpl implements Flow {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<CommunicatingApplication> getDestinationSoftware() {
+	public List<CommunicatingApplication> getDestinationSoftware() {
 		if (destinationSoftware == null) {
 			destinationSoftware = new EObjectResolvingEList<CommunicatingApplication>(CommunicatingApplication.class, this, DNIPackage.FLOW__DESTINATION_SOFTWARE);
 		}
@@ -253,7 +254,7 @@ public class FlowImpl extends IdentifierImpl implements Flow {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<EntityAddress> getDestinationAddresses() {
+	public List<EntityAddress> getDestinationAddresses() {
 		if (destinationAddresses == null) {
 			destinationAddresses = new EObjectContainmentEList<EntityAddress>(EntityAddress.class, this, DNIPackage.FLOW__DESTINATION_ADDRESSES);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/GenericWorkloadImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/GenericWorkloadImpl.java
index 74392db31480e292669d47fdfeb56f9ed3182f45..fca0ad6f073a342c5883b5a714879e4eba13e35d 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/GenericWorkloadImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/GenericWorkloadImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -68,7 +69,7 @@ public class GenericWorkloadImpl extends MinimalEObjectImpl.Container implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AbstractAction> getActions() {
+	public List<AbstractAction> getActions() {
 		if (actions == null) {
 			actions = new EObjectContainmentEList<AbstractAction>(AbstractAction.class, this, DNIPackage.GENERIC_WORKLOAD__ACTIONS);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceTypeImpl.java
index 3da4144c0869d177a73e7817d5f3503b6d5dcafe..80b3623f59656d79fc0179dbc6a20ee661980393 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -255,7 +256,7 @@ public class IntermediatePerformanceTypeImpl extends MinimalEObjectImpl.Containe
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<IntermediatePerformance> getEntities() {
+	public List<IntermediatePerformance> getEntities() {
 		if (entities == null) {
 			entities = new EObjectWithInverseResolvingEList<IntermediatePerformance>(IntermediatePerformance.class, this, DNIPackage.INTERMEDIATE_PERFORMANCE_TYPE__ENTITIES, DNIPackage.INTERMEDIATE_PERFORMANCE__ENTITY_TYPE);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkImpl.java
index 89963ab14cb8eb1a8fbf3e3b572bb53c045a1e5d..962c7614c42f056a322f9ce96f26933af9212df3 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -188,7 +189,7 @@ public class LinkImpl extends IdentifierImpl implements Link {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<NetworkInterface> getConnects() {
+	public List<NetworkInterface> getConnects() {
 		if (connects == null) {
 			connects = new EObjectResolvingEList<NetworkInterface>(NetworkInterface.class, this, DNIPackage.LINK__CONNECTS);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkPerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkPerformanceTypeImpl.java
index eb9f8753fe53cf4bcab100add8b81fda4f4ee1fa..a7e6a6db3325936aededed965fc4283430bcb7ae 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkPerformanceTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkPerformanceTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -255,7 +256,7 @@ public class LinkPerformanceTypeImpl extends MinimalEObjectImpl.Container implem
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<PerformanceLink> getEntities() {
+	public List<PerformanceLink> getEntities() {
 		if (entities == null) {
 			entities = new EObjectWithInverseResolvingEList<PerformanceLink>(PerformanceLink.class, this, DNIPackage.LINK_PERFORMANCE_TYPE__ENTITIES, DNIPackage.PERFORMANCE_LINK__ENTITY_TYPE);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkTypeImpl.java
index 5ca4c2bf1bca09dba02dcfa2d4b3a9538d2bdaff..da72264ded45f8cf9306462ec42479f65daaae14 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -255,7 +256,7 @@ public class LinkTypeImpl extends MinimalEObjectImpl.Container implements LinkTy
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<Link> getEntities() {
+	public List<Link> getEntities() {
 		if (entities == null) {
 			entities = new EObjectWithInverseResolvingEList<Link>(Link.class, this, DNIPackage.LINK_TYPE__ENTITIES, DNIPackage.LINK__ENTITY_TYPE);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkConfigurationImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkConfigurationImpl.java
index 78c2024dfcc97e774cdf0eae6a7cc11990422b5e..b86cdec882d22296921648fd0cf86709019203e4 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkConfigurationImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkConfigurationImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -180,7 +181,7 @@ public class NetworkConfigurationImpl extends MinimalEObjectImpl.Container imple
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<SdnFlowRule> getRules() {
+	public List<SdnFlowRule> getRules() {
 		if (rules == null) {
 			rules = new EObjectContainmentEList<SdnFlowRule>(SdnFlowRule.class, this, DNIPackage.NETWORK_CONFIGURATION__RULES);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceImpl.java
index 82d9eb72e2c88eeca1a70d3abc0df164a136193d..ec159c5ce53c89dbf87c0ddebf79a625624b98c8 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -206,7 +207,7 @@ public class NetworkInterfaceImpl extends MinimalEObjectImpl.Container implement
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<EntityAddress> getAddresses() {
+	public List<EntityAddress> getAddresses() {
 		if (addresses == null) {
 			addresses = new EObjectContainmentEList<EntityAddress>(EntityAddress.class, this, DNIPackage.NETWORK_INTERFACE__ADDRESSES);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfacePerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfacePerformanceTypeImpl.java
index b72707328a1d9bb573af467ad3eb50475f548dea..abd0e40d584c5739e483350947dfdc2bddc04aa6 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfacePerformanceTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfacePerformanceTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -255,7 +256,7 @@ public class NetworkInterfacePerformanceTypeImpl extends MinimalEObjectImpl.Cont
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<PerformanceNetworkInterface> getEntities() {
+	public List<PerformanceNetworkInterface> getEntities() {
 		if (entities == null) {
 			entities = new EObjectWithInverseResolvingEList<PerformanceNetworkInterface>(PerformanceNetworkInterface.class, this, DNIPackage.NETWORK_INTERFACE_PERFORMANCE_TYPE__ENTITIES, DNIPackage.PERFORMANCE_NETWORK_INTERFACE__ENTITY_TYPE);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceTypeImpl.java
index 32c2033dfa96546b06abfd27b2b2c590257cfe57..adf8d3e32a54357a0dc4ff8a8447af4b79483cc4 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -255,7 +256,7 @@ public class NetworkInterfaceTypeImpl extends MinimalEObjectImpl.Container imple
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<NetworkInterface> getEntities() {
+	public List<NetworkInterface> getEntities() {
 		if (entities == null) {
 			entities = new EObjectWithInverseResolvingEList<NetworkInterface>(NetworkInterface.class, this, DNIPackage.NETWORK_INTERFACE_TYPE__ENTITIES, DNIPackage.NETWORK_INTERFACE__ENTITY_TYPE);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkStructureImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkStructureImpl.java
index 4b1e97c233a7a0231215437c0a8c14bea34c72bd..14d302e71aade77c8286e36e6aec0d90bc4e28c0 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkStructureImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkStructureImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -80,7 +81,7 @@ public class NetworkStructureImpl extends MinimalEObjectImpl.Container implement
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<Node> getNodes() {
+	public List<Node> getNodes() {
 		if (nodes == null) {
 			nodes = new EObjectContainmentEList<Node>(Node.class, this, DNIPackage.NETWORK_STRUCTURE__NODES);
 		}
@@ -92,7 +93,7 @@ public class NetworkStructureImpl extends MinimalEObjectImpl.Container implement
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<Link> getLinks() {
+	public List<Link> getLinks() {
 		if (links == null) {
 			links = new EObjectContainmentEList<Link>(Link.class, this, DNIPackage.NETWORK_STRUCTURE__LINKS);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkTrafficImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkTrafficImpl.java
index e348b5cf52c542be21a8444d97043b8270c81832..a250ec081db569aa926b7e1c0eae38775f355d3e 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkTrafficImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkTrafficImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -80,7 +81,7 @@ public class NetworkTrafficImpl extends MinimalEObjectImpl.Container implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<Flow> getFlows() {
+	public List<Flow> getFlows() {
 		if (flows == null) {
 			flows = new EObjectContainmentEList<Flow>(Flow.class, this, DNIPackage.NETWORK_TRAFFIC__FLOWS);
 		}
@@ -92,7 +93,7 @@ public class NetworkTrafficImpl extends MinimalEObjectImpl.Container implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<CommunicatingApplication> getSoftware() {
+	public List<CommunicatingApplication> getSoftware() {
 		if (software == null) {
 			software = new EObjectContainmentEList<CommunicatingApplication>(CommunicatingApplication.class, this, DNIPackage.NETWORK_TRAFFIC__SOFTWARE);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeImpl.java
index 02782668dd14a96dfcdae6e02c4e0751235c1839..64733ff21bce4b53334bb5980c8c00f5d0b10278 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -266,7 +267,7 @@ public class NodeImpl extends IdentifierImpl implements Node {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<NetworkInterface> getInterfaces() {
+	public List<NetworkInterface> getInterfaces() {
 		if (interfaces == null) {
 			interfaces = new EObjectContainmentWithInverseEList<NetworkInterface>(NetworkInterface.class, this, DNIPackage.NODE__INTERFACES, DNIPackage.NETWORK_INTERFACE__NODE);
 		}
@@ -387,7 +388,7 @@ public class NodeImpl extends IdentifierImpl implements Node {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<Node> getHosts() {
+	public List<Node> getHosts() {
 		if (hosts == null) {
 			hosts = new EObjectWithInverseResolvingEList<Node>(Node.class, this, DNIPackage.NODE__HOSTS, DNIPackage.NODE__IS_HOSTED_ON);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeTypeImpl.java
index 0716427fc8d01b1326c9d21465a269f3a75ebd93..097437200470aa4a76ecf4b1b628c8e9da05e7f8 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -255,7 +256,7 @@ public class NodeTypeImpl extends MinimalEObjectImpl.Container implements NodeTy
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<Node> getEntities() {
+	public List<Node> getEntities() {
 		if (entities == null) {
 			entities = new EObjectWithInverseResolvingEList<Node>(Node.class, this, DNIPackage.NODE_TYPE__ENTITIES, DNIPackage.NODE__ENTITY_TYPE);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolStackImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolStackImpl.java
index 029d3127f4186adb0893e65f5b1da6a36f1e3f99..24216537ce7a694e36ba90e073e727f81badf478 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolStackImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolStackImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -154,7 +155,7 @@ public class ProtocolStackImpl extends IdentifierImpl implements ProtocolStack {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<ProtocolLayer> getLayers() {
+	public List<ProtocolLayer> getLayers() {
 		if (layers == null) {
 			layers = new EObjectContainmentEList<ProtocolLayer>(ProtocolLayer.class, this, DNIPackage.PROTOCOL_STACK__LAYERS);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolsRepositoryImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolsRepositoryImpl.java
index b5b778dcebdc0f636d14dac2a1fe1b471d4ad74b..daa61026128bf8a18d96a31b2e9f7dd936e835ec 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolsRepositoryImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolsRepositoryImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -80,7 +81,7 @@ public class ProtocolsRepositoryImpl extends MinimalEObjectImpl.Container implem
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<ProtocolStack> getStacks() {
+	public List<ProtocolStack> getStacks() {
 		if (stacks == null) {
 			stacks = new EObjectContainmentEList<ProtocolStack>(ProtocolStack.class, this, DNIPackage.PROTOCOLS_REPOSITORY__STACKS);
 		}
@@ -92,7 +93,7 @@ public class ProtocolsRepositoryImpl extends MinimalEObjectImpl.Container implem
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<NetworkProtocol> getProtocols() {
+	public List<NetworkProtocol> getProtocols() {
 		if (protocols == null) {
 			protocols = new EObjectContainmentEList<NetworkProtocol>(NetworkProtocol.class, this, DNIPackage.PROTOCOLS_REPOSITORY__PROTOCOLS);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/RoutesRepositoryImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/RoutesRepositoryImpl.java
index e9a6eac7538f759f1ccc892a8a2fd684259a540b..6b68a11ca20c673f427f59fe747a15c5cf636cda 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/RoutesRepositoryImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/RoutesRepositoryImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -92,7 +93,7 @@ public class RoutesRepositoryImpl extends MinimalEObjectImpl.Container implement
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<Route> getRoutes() {
+	public List<Route> getRoutes() {
 		if (routes == null) {
 			routes = new EObjectContainmentEList<Route>(Route.class, this, DNIPackage.ROUTES_REPOSITORY__ROUTES);
 		}
@@ -104,7 +105,7 @@ public class RoutesRepositoryImpl extends MinimalEObjectImpl.Container implement
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<FlowRoute> getFlowRoutes() {
+	public List<FlowRoute> getFlowRoutes() {
 		if (flowRoutes == null) {
 			flowRoutes = new EObjectContainmentEList<FlowRoute>(FlowRoute.class, this, DNIPackage.ROUTES_REPOSITORY__FLOW_ROUTES);
 		}
@@ -116,7 +117,7 @@ public class RoutesRepositoryImpl extends MinimalEObjectImpl.Container implement
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<Direction> getDirections() {
+	public List<Direction> getDirections() {
 		if (directions == null) {
 			directions = new EObjectContainmentEList<Direction>(Direction.class, this, DNIPackage.ROUTES_REPOSITORY__DIRECTIONS);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SDNImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SDNImpl.java
index 17c2daee65ea5b9f9d11a33e007911bf669415fa..0a974040927790387c64a33b44df8818fb0c39ec 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SDNImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SDNImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -137,7 +138,7 @@ public class SDNImpl extends MinimalEObjectImpl.Container implements SDN {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<SdnController> getController() {
+	public List<SdnController> getController() {
 		if (controller == null) {
 			controller = new EObjectWithInverseResolvingEList.ManyInverse<SdnController>(SdnController.class, this, DNIPackage.SDN__CONTROLLER, DNIPackage.SDN_CONTROLLER__NODES);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnControllerImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnControllerImpl.java
index 7bc17d6cfbc4c9354be6f5867e780c9035392ec6..a4fcf4c0f263ef1268085aa67eee278321ddd932 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnControllerImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnControllerImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -79,7 +80,7 @@ public class SdnControllerImpl extends CommunicatingApplicationImpl implements S
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<SdnControllerApplication> getApplications() {
+	public List<SdnControllerApplication> getApplications() {
 		if (applications == null) {
 			applications = new EObjectContainmentWithInverseEList<SdnControllerApplication>(SdnControllerApplication.class, this, DNIPackage.SDN_CONTROLLER__APPLICATIONS, DNIPackage.SDN_CONTROLLER_APPLICATION__BELONGS_TO);
 		}
@@ -91,7 +92,7 @@ public class SdnControllerImpl extends CommunicatingApplicationImpl implements S
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<SDN> getNodes() {
+	public List<SDN> getNodes() {
 		if (nodes == null) {
 			nodes = new EObjectWithInverseResolvingEList.ManyInverse<SDN>(SDN.class, this, DNIPackage.SDN_CONTROLLER__NODES, DNIPackage.SDN__CONTROLLER);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnNodePerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnNodePerformanceTypeImpl.java
index e72966a2c5c788dd2d5c518ff62a62a0595f8b89..0d7df565356a58551b4838addb21e4a7d126a7d9 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnNodePerformanceTypeImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnNodePerformanceTypeImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -255,7 +256,7 @@ public class SdnNodePerformanceTypeImpl extends MinimalEObjectImpl.Container imp
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<PerformanceSdnNode> getEntities() {
+	public List<PerformanceSdnNode> getEntities() {
 		if (entities == null) {
 			entities = new EObjectWithInverseResolvingEList<PerformanceSdnNode>(PerformanceSdnNode.class, this, DNIPackage.SDN_NODE_PERFORMANCE_TYPE__ENTITIES, DNIPackage.PERFORMANCE_SDN_NODE__ENTITY_TYPE);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SequenceActionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SequenceActionImpl.java
index 143f46066135d6fe1f789a94fb1d730eed590eca..05d12dbeb6bb2aae0af6b078cd17978614c663aa 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SequenceActionImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SequenceActionImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -68,7 +69,7 @@ public class SequenceActionImpl extends MinimalEObjectImpl.Container implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<AbstractAction> getIntern() {
+	public List<AbstractAction> getIntern() {
 		if (intern == null) {
 			intern = new EObjectContainmentEList<AbstractAction>(AbstractAction.class, this, DNIPackage.SEQUENCE_ACTION__INTERN);
 		}
diff --git a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/TrafficSourceImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/TrafficSourceImpl.java
index b5eeb6d2677399b59ee0770a652c9b6450665f25..b3941d22bf8087a39b97d7f22607acd6f3d6df2a 100644
--- a/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/TrafficSourceImpl.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/TrafficSourceImpl.java
@@ -4,6 +4,7 @@ package tools.descartes.dni.dnimm3.impl;
 
 import java.util.Collection;
 
+import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -170,7 +171,7 @@ public class TrafficSourceImpl extends IdentifierImpl implements TrafficSource {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<EntityAddress> getAddresses() {
+	public List<EntityAddress> getAddresses() {
 		if (addresses == null) {
 			addresses = new EObjectContainmentEList<EntityAddress>(EntityAddress.class, this, DNIPackage.TRAFFIC_SOURCE__ADDRESSES);
 		}
@@ -182,7 +183,7 @@ public class TrafficSourceImpl extends IdentifierImpl implements TrafficSource {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<Workload> getWorkload() {
+	public List<Workload> getWorkload() {
 		if (workload == null) {
 			workload = new EObjectContainmentEList<Workload>(Workload.class, this, DNIPackage.TRAFFIC_SOURCE__WORKLOAD);
 		}