Add authentication type into the model

20 files changed, 1233 insertions, 628 deletions

diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/Messages.java b/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/Messages.java
index 06e4bed..b810c10 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/Messages.java
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/Messages.java
@@ -32,6 +32,8 @@ public class Messages extends NLS {
 	public static String ConfigurationPage_SaveSettings;
 	public static String ConfigurationPage_DeviceID;
 
+	public static String ConfigurationPage_AuthenticationType;
+
 	public static String DeviceSection_Title;
 	public static String DeviceSection_Description;
 
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/internal/configuration/ConfigurationPage.java b/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/internal/configuration/ConfigurationPage.java
index 2f88217..4c3a594 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/internal/configuration/ConfigurationPage.java
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/internal/configuration/ConfigurationPage.java
@@ -11,6 +11,7 @@
 package org.eclipse.koneki.simulators.omadm.editor.internal.configuration;
 
 import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.emf.databinding.edit.EMFEditObservables;
@@ -18,11 +19,15 @@ import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.koneki.commons.ui.ANWRTToolkit;
 import org.eclipse.koneki.commons.ui.CommonFonts;
 import org.eclipse.koneki.commons.ui.widgets.InfoBanner;
 import org.eclipse.koneki.simulators.omadm.editor.Messages;
 import org.eclipse.koneki.simulators.omadm.editor.OMADMSimulatorEditor;
+import org.eclipse.koneki.simulators.omadm.model.AuthenticationType;
+import org.eclipse.koneki.simulators.omadm.model.Device;
 import org.eclipse.koneki.simulators.omadm.model.OMADMSimulatorPackage;
 import org.eclipse.pde.emfforms.editor.AbstractEmfFormPage;
 import org.eclipse.swt.SWT;
@@ -36,14 +41,19 @@ public class ConfigurationPage extends AbstractEmfFormPage {
 	private Text serverURI;
 	private Text serverLogin;
 	private Text serverPassword;
+	private ComboViewer authenticationType;
 	// private Shell currentShell;
 	private Text deviceIdText;
 
+	private OMADMSimulatorEditor editor;
+
 	// private Button associateModelButton;
 	// private Label associatedModel;
 
 	public ConfigurationPage(OMADMSimulatorEditor editor) {
 		super(editor, 1, Messages.ConfigurationPage_Title);
+
+		this.editor = editor;
 	}
 
 	@Override
@@ -53,6 +63,33 @@ public class ConfigurationPage extends AbstractEmfFormPage {
 
 	@Override
 	public void bind(DataBindingContext bindingContext) {
+
+		final UpdateValueStrategy targetToModel = new UpdateValueStrategy() {
+
+			@Override
+			public Object convert(Object value) {
+				Device device = editor.getOMADMSimulation().getDevice();
+				AuthenticationType auth = AuthenticationType.get(value.toString());
+				device.setAuthentication(auth);
+
+				return auth;
+			}
+
+		};
+		final UpdateValueStrategy modelToTarget = new UpdateValueStrategy() {
+
+			@Override
+			public Object convert(Object value) {
+
+				Device device = editor.getOMADMSimulation().getDevice();
+				AuthenticationType auth = device.getAuthentication();
+				authenticationType.setSelection(new StructuredSelection(auth));
+
+				return auth;
+			}
+
+		};
+
 		final EditingDomain editingDomain = getEditor().getEditingDomain();
 		final IObservableValue simulationObservable = getEditor().getInputObservable();
 		final IObservableValue deviceObservable = EMFEditObservables.observeDetailValue(Realm.getDefault(), editingDomain, simulationObservable,
@@ -73,6 +110,11 @@ public class ConfigurationPage extends AbstractEmfFormPage {
 		// DeviceId
 		bindingContext.bindValue(WidgetProperties.text(SWT.Modify).observe(this.deviceIdText), EMFEditObservables.observeDetailValue(
 				Realm.getDefault(), editingDomain, deviceObservable, OMADMSimulatorPackage.Literals.DEVICE__DEVICE_ID));
+
+		// AuthenticationType
+		bindingContext.bindValue(WidgetProperties.selection().observe(this.authenticationType.getCombo()), EMFEditObservables.observeDetailValue(
+				Realm.getDefault(), editingDomain, deviceObservable, OMADMSimulatorPackage.Literals.AUTHENTICATION_TYPE.eContainingFeature()),
+				targetToModel, modelToTarget);
 	}
 
 	@Override
@@ -117,6 +159,12 @@ public class ConfigurationPage extends AbstractEmfFormPage {
 		deviceIdText = toolkit.createTitleLabelAndText(serverSettingsComposite, Messages.ConfigurationPage_DeviceID);
 		GridDataFactory.fillDefaults().grab(true, false).span(2, 0).applyTo(deviceIdText);
 
+		authenticationType = toolkit.createTitleLabelAndComboViewer(serverSettingsComposite, Messages.ConfigurationPage_AuthenticationType,
+				SWT.DEFAULT);
+		authenticationType.add(AuthenticationType.values());
+		authenticationType.setSelection(new StructuredSelection(AuthenticationType.NONE));
+		GridDataFactory.fillDefaults().grab(false, false).span(0, 0).applyTo(authenticationType.getControl());
+
 		// The association button
 		//
 		// Label associateLabel = toolkit.createTitleLabel(serverSettingsComposite, Messages.SimulationPage_AssociateLabel);
@@ -145,6 +193,11 @@ public class ConfigurationPage extends AbstractEmfFormPage {
 		getEditor();
 	}
 
+	public int getAuthenticationValue() {
+		// return authenticationType.
+		return 0;
+	}
+
 	@Override
 	public void dispose() {
 		super.dispose();
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/internal/dashboard/ConnectSelection.java b/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/internal/dashboard/ConnectSelection.java
index 6991768..222753e 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/internal/dashboard/ConnectSelection.java
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/internal/dashboard/ConnectSelection.java
@@ -93,9 +93,9 @@ class ConnectSelection extends SelectionAdapter {
 		updateServerURI(editor);
 
 		// Connect
-		dmSimulator.simulate(server, page.getEditor().getOMADMSimulation().getDevice().getTree(), page.getEditor().getEditingDomain(),
-				new ConnectCommandHandler(page), new ProtocolListener[] { new ConnectProtocolListener(page) },
-				genericAlerts.toArray(new DMGenericAlert[] {}));
+		dmSimulator.simulate(server, page.getEditor().getOMADMSimulation().getDevice().getTree(), page.getEditor().getOMADMSimulation().getDevice()
+				.getAuthentication(), page.getEditor().getEditingDomain(), new ConnectCommandHandler(page),
+				new ProtocolListener[] { new ConnectProtocolListener(page) }, genericAlerts.toArray(new DMGenericAlert[] {}));
 		if (monitor.isCanceled()) {
 			return Status.CANCEL_STATUS;
 		} else {
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/messages.properties b/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/messages.properties
index c793390..0bb18e8 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/messages.properties
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.editor/src/org/eclipse/koneki/simulators/omadm/editor/messages.properties
@@ -19,6 +19,7 @@ ConfigurationPage_ServerLogin=Server login :
 ConfigurationPage_ServerPassword=Server password :
 ConfigurationPage_SaveSettings=Save
 ConfigurationPage_DeviceID=Device ID :
+ConfigurationPage_AuthenticationType=Authentication type :
 
 DeviceSection_Title=Device tree
 DeviceSection_Description=Edit the device tree
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model.edit/plugin.properties b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model.edit/plugin.properties
index 1293ebb..07db704 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model.edit/plugin.properties
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model.edit/plugin.properties
@@ -103,3 +103,6 @@ _UI_CommandManagement_CONSTANT_literal = constant
 _UI_Device_login_feature = Login
 _UI_Device_password_feature = Password
 _UI_Device_serverUrl_feature = Server Url
+_UI_AuthenticationType_BASIC_literal = basic
+_UI_AuthenticationType_NONE_literal = none
+_UI_Device_authentication_feature = Authentication
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model.edit/src/org/eclipse/koneki/simulators/omadm/model/provider/DeviceItemProvider.java b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model.edit/src/org/eclipse/koneki/simulators/omadm/model/provider/DeviceItemProvider.java
index ba37c04..d982982 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model.edit/src/org/eclipse/koneki/simulators/omadm/model/provider/DeviceItemProvider.java
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model.edit/src/org/eclipse/koneki/simulators/omadm/model/provider/DeviceItemProvider.java
@@ -65,6 +65,7 @@ public class DeviceItemProvider extends ItemProviderAdapter implements IEditingD
 			addLoginPropertyDescriptor(object);
 			addPasswordPropertyDescriptor(object);
 			addServerUrlPropertyDescriptor(object);
+			addAuthenticationPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -180,6 +181,28 @@ public class DeviceItemProvider extends ItemProviderAdapter implements IEditingD
 	}
 
 	/**
+	 * This adds a property descriptor for the Authentication feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAuthenticationPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Device_authentication_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Device_authentication_feature", "_UI_Device_type"),
+				 OMADMSimulatorPackage.Literals.DEVICE__AUTHENTICATION,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
@@ -245,6 +268,7 @@ public class DeviceItemProvider extends ItemProviderAdapter implements IEditingD
 			case OMADMSimulatorPackage.DEVICE__LOGIN:
 			case OMADMSimulatorPackage.DEVICE__PASSWORD:
 			case OMADMSimulatorPackage.DEVICE__SERVER_URL:
+			case OMADMSimulatorPackage.DEVICE__AUTHENTICATION:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case OMADMSimulatorPackage.DEVICE__TREE:
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/model/omadmsimulation.ecore b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/model/omadmsimulation.ecore
index 1a3cbd5..edcab64 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/model/omadmsimulation.ecore
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/model/omadmsimulation.ecore
@@ -25,6 +25,8 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="serverUrl" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" transient="true"
         derived="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="authentication" lowerBound="1"
+        eType="#//AuthenticationType"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="DeviceIdType">
     <eLiterals name="FREE" literal="free"/>
@@ -105,4 +107,8 @@
     <eLiterals name="MANUAL" value="2" literal="manual"/>
     <eLiterals name="CONSTANT" value="3" literal="constant"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="AuthenticationType">
+    <eLiterals name="BASIC" literal="basic"/>
+    <eLiterals name="NONE" value="1" literal="none"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/model/omadmsimulation.ecorediag b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/model/omadmsimulation.ecorediag
index 1b39109..40ac590 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/model/omadmsimulation.ecorediag
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/model/omadmsimulation.ecorediag
@@ -14,23 +14,11 @@
     </children>
     <styles xmi:type="notation:ShapeStyle" xmi:id="_6NlAQXuvEeCULNc6FMarag" fontColor="4210752" fontName="Ubuntu" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
     <element xmi:type="ecore:EClass" href="omadmsimulation.ecore#//OMADMSimulation"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6NlAQnuvEeCULNc6FMarag" x="260" y="120"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6NlAQnuvEeCULNc6FMarag" x="290" y="165"/>
   </children>
   <children xmi:type="notation:Node" xmi:id="_82_SgHuvEeCULNc6FMarag" type="1001">
     <children xmi:type="notation:Node" xmi:id="_82_5kHuvEeCULNc6FMarag" type="4001"/>
     <children xmi:type="notation:Node" xmi:id="_82_5kXuvEeCULNc6FMarag" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_FPWroHuwEeCULNc6FMarag" type="2001">
-        <element xmi:type="ecore:EAttribute" href="omadmsimulation.ecore#//Device/groupPath"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FPWroXuwEeCULNc6FMarag"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_H2lzoHuwEeCULNc6FMarag" type="2001">
-        <element xmi:type="ecore:EAttribute" href="omadmsimulation.ecore#//Device/modelName"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_H2lzoXuwEeCULNc6FMarag"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_LMexYHuwEeCULNc6FMarag" type="2001">
-        <element xmi:type="ecore:EAttribute" href="omadmsimulation.ecore#//Device/customerPath"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LMexYXuwEeCULNc6FMarag"/>
-      </children>
       <children xmi:type="notation:Node" xmi:id="_Ni1kwHuwEeCULNc6FMarag" type="2001">
         <element xmi:type="ecore:EAttribute" href="omadmsimulation.ecore#//Device/deviceId"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Ni1kwXuwEeCULNc6FMarag"/>
@@ -39,6 +27,22 @@
         <element xmi:type="ecore:EAttribute" href="omadmsimulation.ecore#//Device/deviceIdType"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_faFTIXuwEeCULNc6FMarag"/>
       </children>
+      <children xmi:type="notation:Node" xmi:id="_8TokwLVWEeG5SZFd1R_ZqQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="omadmsimulation.ecore#//Device/login"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8TokwbVWEeG5SZFd1R_ZqQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_8TpL0LVWEeG5SZFd1R_ZqQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="omadmsimulation.ecore#//Device/password"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8TpL0bVWEeG5SZFd1R_ZqQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_8Tpy4LVWEeG5SZFd1R_ZqQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="omadmsimulation.ecore#//Device/serverUrl"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8Tpy4bVWEeG5SZFd1R_ZqQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_FT6ScLVXEeG5SZFd1R_ZqQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="omadmsimulation.ecore#//Device/authentication"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FT6ScbVXEeG5SZFd1R_ZqQ"/>
+      </children>
       <styles xmi:type="notation:DrawerStyle" xmi:id="_82_5knuvEeCULNc6FMarag"/>
       <styles xmi:type="notation:SortingStyle" xmi:id="_82_5k3uvEeCULNc6FMarag"/>
       <styles xmi:type="notation:FilteringStyle" xmi:id="_82_5lHuvEeCULNc6FMarag"/>
@@ -50,7 +54,7 @@
     </children>
     <styles xmi:type="notation:ShapeStyle" xmi:id="_82_SgXuvEeCULNc6FMarag" fontColor="4210752" fontName="Ubuntu" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
     <element xmi:type="ecore:EClass" href="omadmsimulation.ecore#//Device"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_82_SgnuvEeCULNc6FMarag" x="240" y="240"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_82_SgnuvEeCULNc6FMarag" x="235" y="240"/>
   </children>
   <children xmi:type="notation:Node" xmi:id="_Pemt4HuwEeCULNc6FMarag" type="1005">
     <children xmi:type="notation:Node" xmi:id="_Pen8AHuwEeCULNc6FMarag" type="4010"/>
@@ -61,7 +65,7 @@
     </children>
     <styles xmi:type="notation:ShapeStyle" xmi:id="_Pemt4XuwEeCULNc6FMarag" fontColor="4210752" fontName="Ubuntu" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
     <element xmi:type="ecore:EEnum" href="omadmsimulation.ecore#//DeviceIdType"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pemt4nuwEeCULNc6FMarag" x="555" y="120"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pemt4nuwEeCULNc6FMarag" x="560" y="355"/>
   </children>
   <children xmi:type="notation:Node" xmi:id="_wCPTIHyrEeCB-c430TL9_g" type="1005">
     <children xmi:type="notation:Node" xmi:id="_wCQhQHyrEeCB-c430TL9_g" type="4010"/>
@@ -116,7 +120,7 @@
     </children>
     <styles xmi:type="notation:ShapeStyle" xmi:id="_wCPTIXyrEeCB-c430TL9_g" fontColor="4210752" fontName="Ubuntu" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
     <element xmi:type="ecore:EEnum" href="omadmsimulation.ecore#//NodeFormat"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wCPTInyrEeCB-c430TL9_g" x="555" y="215"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wCPTInyrEeCB-c430TL9_g" x="560" y="450"/>
   </children>
   <children xmi:type="notation:Node" xmi:id="_pWk28HysEeCB-c430TL9_g" type="1001">
     <children xmi:type="notation:Node" xmi:id="_pWleAHysEeCB-c430TL9_g" type="4001"/>
@@ -291,15 +295,34 @@
     </children>
     <styles xmi:type="notation:ShapeStyle" xmi:id="_eGPygoxgEeCgg-GMDGxsgw" fontColor="4210752" fontName="Ubuntu" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
     <element xmi:type="ecore:EEnum" href="omadmsimulation.ecore#//CommandManagement"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eGPyg4xgEeCgg-GMDGxsgw" x="555" y="435"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eGPyg4xgEeCgg-GMDGxsgw" x="560" y="670"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_yEjZEbU_EeG5SZFd1R_ZqQ" type="1005">
+    <children xmi:type="notation:Node" xmi:id="_yEqt0LU_EeG5SZFd1R_ZqQ" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_yErU4LU_EeG5SZFd1R_ZqQ" type="5008">
+      <children xmi:type="notation:Node" xmi:id="_0Ov_wLU_EeG5SZFd1R_ZqQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="omadmsimulation.ecore#//AuthenticationType/BASIC"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0Ov_wbU_EeG5SZFd1R_ZqQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_8EraMLU_EeG5SZFd1R_ZqQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="omadmsimulation.ecore#//AuthenticationType/NONE"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8EraMbU_EeG5SZFd1R_ZqQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_yErU4bU_EeG5SZFd1R_ZqQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_yErU4rU_EeG5SZFd1R_ZqQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_yErU47U_EeG5SZFd1R_ZqQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_yEjZErU_EeG5SZFd1R_ZqQ" fontColor="4210752" fontName="Ubuntu" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="omadmsimulation.ecore#//AuthenticationType"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yEjZE7U_EeG5SZFd1R_ZqQ" x="573" y="812"/>
   </children>
   <styles xmi:type="notation:DiagramStyle" xmi:id="_4-IKkXuvEeCULNc6FMarag"/>
   <element xmi:type="ecore:EPackage" href="omadmsimulation.ecore#/"/>
   <edges xmi:type="notation:Edge" xmi:id="_AedIcHuwEeCULNc6FMarag" type="3002" source="_6NlAQHuvEeCULNc6FMarag" target="_82_SgHuvEeCULNc6FMarag">
-    <children xmi:type="notation:Node" xmi:id="_AedvgHuwEeCULNc6FMarag" type="4011">
+    <children xmi:type="notation:Node" xmi:id="_AedvgHuwEeCULNc6FMarag" visible="false" type="4011">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_AedvgXuwEeCULNc6FMarag" x="-10" y="-10"/>
     </children>
-    <children xmi:type="notation:Node" xmi:id="_AedvgnuwEeCULNc6FMarag" type="4012">
+    <children xmi:type="notation:Node" xmi:id="_AedvgnuwEeCULNc6FMarag" visible="false" type="4012">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_Aedvg3uwEeCULNc6FMarag" x="10" y="10"/>
     </children>
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_AedIcXuwEeCULNc6FMarag" lineColor="4210752"/>
@@ -309,10 +332,10 @@
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lNhP0IxjEeCgg-GMDGxsgw" id="(0.4519230769230769,0.0)"/>
   </edges>
   <edges xmi:type="notation:Edge" xmi:id="_rtPMUHysEeCB-c430TL9_g" type="3002" source="_82_SgHuvEeCULNc6FMarag" target="_pWk28HysEeCB-c430TL9_g">
-    <children xmi:type="notation:Node" xmi:id="_rtQacHysEeCB-c430TL9_g" type="4011">
+    <children xmi:type="notation:Node" xmi:id="_rtQacHysEeCB-c430TL9_g" visible="false" type="4011">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_rtQacXysEeCB-c430TL9_g" x="-10" y="-10"/>
     </children>
-    <children xmi:type="notation:Node" xmi:id="_rtRokHysEeCB-c430TL9_g" type="4012">
+    <children xmi:type="notation:Node" xmi:id="_rtRokHysEeCB-c430TL9_g" visible="false" type="4012">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_rtRokXysEeCB-c430TL9_g" x="10" y="10"/>
     </children>
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_rtPMUXysEeCB-c430TL9_g" lineColor="4210752"/>
@@ -322,30 +345,30 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rtV6AHysEeCB-c430TL9_g" id="(0.5048076923076923,0.9734513274336283)"/>
   </edges>
   <edges xmi:type="notation:Edge" xmi:id="__2dkYHysEeCB-c430TL9_g" type="3002" source="_pWk28HysEeCB-c430TL9_g" target="_pWk28HysEeCB-c430TL9_g">
-    <children xmi:type="notation:Node" xmi:id="__2eLcHysEeCB-c430TL9_g" type="4011">
+    <children xmi:type="notation:Node" xmi:id="__2eLcHysEeCB-c430TL9_g" visible="false" type="4011">
       <layoutConstraint xmi:type="notation:Location" xmi:id="__2eLcXysEeCB-c430TL9_g" x="-10" y="-10"/>
     </children>
-    <children xmi:type="notation:Node" xmi:id="__2eygHysEeCB-c430TL9_g" type="4012">
+    <children xmi:type="notation:Node" xmi:id="__2eygHysEeCB-c430TL9_g" visible="false" type="4012">
       <layoutConstraint xmi:type="notation:Location" xmi:id="__2eygXysEeCB-c430TL9_g" x="10" y="10"/>
     </children>
     <styles xmi:type="notation:ConnectorStyle" xmi:id="__2dkYXysEeCB-c430TL9_g" lineColor="4210752"/>
     <styles xmi:type="notation:FontStyle" xmi:id="__2dkYnysEeCB-c430TL9_g" fontColor="4210752" fontName="Ubuntu" fontHeight="10"/>
     <element xmi:type="ecore:EReference" href="omadmsimulation.ecore#//Node/children"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__2dkY3ysEeCB-c430TL9_g" points="[0, 6, 101, 4]$[0, 85, 101, 83]$[-107, 85, -6, 83]$[-107, 6, -6, 4]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tY1HEb55EeCWWrKAZdpP7Q" id="(0.448,0.9929245283018868)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tY1uIL55EeCWWrKAZdpP7Q" id="(0.11666666666666667,0.9767441860465116)"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__2dkY3ysEeCB-c430TL9_g" points="[-6, 4, 113, 13]$[-6, 34, 113, 43]$[-111, 34, 8, 43]$[-111, 4, 8, 13]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FvRcAK-1EeGpmcizsstOmQ" id="(0.448,0.9929245283018868)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FvRcAa-1EeGpmcizsstOmQ" id="(0.11666666666666667,0.9767441860465116)"/>
   </edges>
   <edges xmi:type="notation:Edge" xmi:id="_8pq7wIxkEeCgg-GMDGxsgw" type="3002" source="_pWk28HysEeCB-c430TL9_g" target="_pWk28HysEeCB-c430TL9_g">
-    <children xmi:type="notation:Node" xmi:id="_8pri0IxkEeCgg-GMDGxsgw" type="4011">
+    <children xmi:type="notation:Node" xmi:id="_8pri0IxkEeCgg-GMDGxsgw" visible="false" type="4011">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_8pri0YxkEeCgg-GMDGxsgw" x="-10" y="-10"/>
     </children>
-    <children xmi:type="notation:Node" xmi:id="_8pri0oxkEeCgg-GMDGxsgw" type="4012">
+    <children xmi:type="notation:Node" xmi:id="_8pri0oxkEeCgg-GMDGxsgw" visible="false" type="4012">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_8pri04xkEeCgg-GMDGxsgw" x="10" y="10"/>
     </children>
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_8pq7wYxkEeCgg-GMDGxsgw" lineColor="4210752"/>
     <styles xmi:type="notation:FontStyle" xmi:id="_8pq7woxkEeCgg-GMDGxsgw" fontColor="4210752" fontName="Ubuntu" fontHeight="10"/>
     <element xmi:type="ecore:EReference" href="omadmsimulation.ecore#//Node/parent"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8pq7w4xkEeCgg-GMDGxsgw" points="[-6, 4, -107, 6]$[-6, 83, -107, 85]$[101, 83, 0, 85]$[101, 4, 0, 6]"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8pq7w4xkEeCgg-GMDGxsgw" points="[8, 13, -111, 4]$[8, 43, -111, 34]$[113, 43, -6, 34]$[113, 13, -6, 4]"/>
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8pumIIxkEeCgg-GMDGxsgw" id="(0.11666666666666667,0.9767441860465116)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8pumIYxkEeCgg-GMDGxsgw" id="(0.448,0.9929245283018868)"/>
   </edges>
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/model/omadmsimulation.genmodel b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/model/omadmsimulation.genmodel
index b6cafe6..3c92929 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/model/omadmsimulation.genmodel
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/model/omadmsimulation.genmodel
@@ -40,6 +40,10 @@
       <genEnumLiterals ecoreEnumLiteral="omadmsimulation.ecore#//CommandManagement/MANUAL"/>
       <genEnumLiterals ecoreEnumLiteral="omadmsimulation.ecore#//CommandManagement/CONSTANT"/>
     </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="omadmsimulation.ecore#//AuthenticationType">
+      <genEnumLiterals ecoreEnumLiteral="omadmsimulation.ecore#//AuthenticationType/BASIC"/>
+      <genEnumLiterals ecoreEnumLiteral="omadmsimulation.ecore#//AuthenticationType/NONE"/>
+    </genEnums>
     <genClasses ecoreClass="omadmsimulation.ecore#//OMADMSimulation">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference omadmsimulation.ecore#//OMADMSimulation/device"/>
     </genClasses>
@@ -50,6 +54,7 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute omadmsimulation.ecore#//Device/login"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute omadmsimulation.ecore#//Device/password"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute omadmsimulation.ecore#//Device/serverUrl"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute omadmsimulation.ecore#//Device/authentication"/>
     </genClasses>
     <genClasses ecoreClass="omadmsimulation.ecore#//Node">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute omadmsimulation.ecore#//Node/name"/>
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/AuthenticationType.java b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/AuthenticationType.java
new file mode 100644
index 0000000..f913835
--- a/dev/null
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/AuthenticationType.java
@@ -0,0 +1,212 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.koneki.simulators.omadm.model;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Authentication Type</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.koneki.simulators.omadm.model.OMADMSimulatorPackage#getAuthenticationType()
+ * @model
+ * @generated
+ */
+public enum AuthenticationType implements Enumerator {
+	/**
+	 * The '<em><b>BASIC</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #BASIC_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	BASIC(0, "BASIC", "basic"),
+
+	/**
+	 * The '<em><b>NONE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NONE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	NONE(1, "NONE", "none");
+
+	/**
+	 * The '<em><b>BASIC</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>BASIC</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #BASIC
+	 * @model literal="basic"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int BASIC_VALUE = 0;
+
+	/**
+	 * The '<em><b>NONE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #NONE
+	 * @model literal="none"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int NONE_VALUE = 1;
+
+	/**
+	 * An array of all the '<em><b>Authentication Type</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final AuthenticationType[] VALUES_ARRAY =
+		new AuthenticationType[] {
+			BASIC,
+			NONE,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Authentication Type</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<AuthenticationType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Authentication Type</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static AuthenticationType get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			AuthenticationType result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Authentication Type</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static AuthenticationType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			AuthenticationType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Authentication Type</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static AuthenticationType get(int value) {
+		switch (value) {
+			case BASIC_VALUE: return BASIC;
+			case NONE_VALUE: return NONE;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private AuthenticationType(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //AuthenticationType
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/Device.java b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/Device.java
index e6765db..cd91d9b 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/Device.java
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/Device.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Device#getLogin <em>Login</em>}</li>
  *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Device#getPassword <em>Password</em>}</li>
  *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Device#getServerUrl <em>Server Url</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Device#getAuthentication <em>Authentication</em>}</li>
  * </ul>
  * </p>
  *
@@ -190,4 +191,33 @@ public interface Device extends EObject {
 	 */
 	void setServerUrl(String value);
 
+	/**
+	 * Returns the value of the '<em><b>Authentication</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.eclipse.koneki.simulators.omadm.model.AuthenticationType}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Authentication</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Authentication</em>' attribute.
+	 * @see org.eclipse.koneki.simulators.omadm.model.AuthenticationType
+	 * @see #setAuthentication(AuthenticationType)
+	 * @see org.eclipse.koneki.simulators.omadm.model.OMADMSimulatorPackage#getDevice_Authentication()
+	 * @model required="true"
+	 * @generated
+	 */
+	AuthenticationType getAuthentication();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.koneki.simulators.omadm.model.Device#getAuthentication <em>Authentication</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Authentication</em>' attribute.
+	 * @see org.eclipse.koneki.simulators.omadm.model.AuthenticationType
+	 * @see #getAuthentication()
+	 * @generated
+	 */
+	void setAuthentication(AuthenticationType value);
+
 } // Device
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/OMADMSimulatorPackage.java b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/OMADMSimulatorPackage.java
index a54a21d..12b166e 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/OMADMSimulatorPackage.java
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/OMADMSimulatorPackage.java
@@ -155,12 +155,21 @@ public interface OMADMSimulatorPackage extends EPackage {
 	int DEVICE__SERVER_URL = 5;
 
 	/**
+	 * The feature id for the '<em><b>Authentication</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__AUTHENTICATION = 6;
+
+	/**
 	 * The number of structural features of the '<em>Device</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DEVICE_FEATURE_COUNT = 6;
+	int DEVICE_FEATURE_COUNT = 7;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl <em>Node</em>}' class.
@@ -355,6 +364,16 @@ public interface OMADMSimulatorPackage extends EPackage {
 	int COMMAND_MANAGEMENT = 5;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.koneki.simulators.omadm.model.AuthenticationType <em>Authentication Type</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.koneki.simulators.omadm.model.AuthenticationType
+	 * @see org.eclipse.koneki.simulators.omadm.model.impl.OMADMSimulatorPackageImpl#getAuthenticationType()
+	 * @generated
+	 */
+	int AUTHENTICATION_TYPE = 6;
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.koneki.simulators.omadm.model.OMADMSimulation <em>OMADM Simulation</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -451,6 +470,17 @@ public interface OMADMSimulatorPackage extends EPackage {
 	EAttribute getDevice_ServerUrl();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.koneki.simulators.omadm.model.Device#getAuthentication <em>Authentication</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Authentication</em>'.
+	 * @see org.eclipse.koneki.simulators.omadm.model.Device#getAuthentication()
+	 * @see #getDevice()
+	 * @generated
+	 */
+	EAttribute getDevice_Authentication();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.koneki.simulators.omadm.model.Node <em>Node</em>}'.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -684,6 +714,16 @@ public interface OMADMSimulatorPackage extends EPackage {
 	EEnum getCommandManagement();
 
 	/**
+	 * Returns the meta object for enum '{@link org.eclipse.koneki.simulators.omadm.model.AuthenticationType <em>Authentication Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Authentication Type</em>'.
+	 * @see org.eclipse.koneki.simulators.omadm.model.AuthenticationType
+	 * @generated
+	 */
+	EEnum getAuthenticationType();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the factory that creates the instances of the model.
@@ -777,6 +817,14 @@ public interface OMADMSimulatorPackage extends EPackage {
 		EAttribute DEVICE__SERVER_URL = eINSTANCE.getDevice_ServerUrl();
 
 		/**
+		 * The meta object literal for the '<em><b>Authentication</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DEVICE__AUTHENTICATION = eINSTANCE.getDevice_Authentication();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl <em>Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -943,6 +991,16 @@ public interface OMADMSimulatorPackage extends EPackage {
 		 */
 		EEnum COMMAND_MANAGEMENT = eINSTANCE.getCommandManagement();
 
+		/**
+		 * The meta object literal for the '{@link org.eclipse.koneki.simulators.omadm.model.AuthenticationType <em>Authentication Type</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.koneki.simulators.omadm.model.AuthenticationType
+		 * @see org.eclipse.koneki.simulators.omadm.model.impl.OMADMSimulatorPackageImpl#getAuthenticationType()
+		 * @generated
+		 */
+		EEnum AUTHENTICATION_TYPE = eINSTANCE.getAuthenticationType();
+
 	}
 
 } // OMADMSimulatorPackage
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/DeviceImpl.java b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/DeviceImpl.java
index 598e11e..e7295e0 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/DeviceImpl.java
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/DeviceImpl.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.koneki.simulators.omadm.model.AuthenticationType;
 import org.eclipse.koneki.simulators.omadm.model.Device;
 import org.eclipse.koneki.simulators.omadm.model.DeviceIdType;
 import org.eclipse.koneki.simulators.omadm.model.Node;
@@ -31,21 +32,22 @@ import org.eclipse.koneki.simulators.omadm.model.util.NodeHelpers;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.DeviceImpl#getDeviceIdType <em>Device Id Type</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.DeviceImpl#getTree <em>Tree</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.DeviceImpl#getDeviceId <em>Device Id</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.DeviceImpl#getLogin <em>Login</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.DeviceImpl#getPassword <em>Password</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.DeviceImpl#getServerUrl <em>Server Url</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.DeviceImpl#getDeviceIdType <em>Device Id Type</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.DeviceImpl#getTree <em>Tree</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.DeviceImpl#getDeviceId <em>Device Id</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.DeviceImpl#getLogin <em>Login</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.DeviceImpl#getPassword <em>Password</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.DeviceImpl#getServerUrl <em>Server Url</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.DeviceImpl#getAuthentication <em>Authentication</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class DeviceImpl extends EObjectImpl implements Device {
 	/**
-	 * The default value of the '{@link #getDeviceIdType() <em>Device Id Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getDeviceIdType() <em>Device Id Type</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDeviceIdType()
 	 * @generated
 	 * @ordered
@@ -53,8 +55,8 @@ public class DeviceImpl extends EObjectImpl implements Device {
 	protected static final DeviceIdType DEVICE_ID_TYPE_EDEFAULT = DeviceIdType.FREE;
 
 	/**
-	 * The cached value of the '{@link #getDeviceIdType() <em>Device Id Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getDeviceIdType() <em>Device Id Type</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDeviceIdType()
 	 * @generated
 	 * @ordered
@@ -62,8 +64,8 @@ public class DeviceImpl extends EObjectImpl implements Device {
 	protected DeviceIdType deviceIdType = DEVICE_ID_TYPE_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getTree() <em>Tree</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getTree() <em>Tree</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getTree()
 	 * @generated
 	 * @ordered
@@ -71,8 +73,8 @@ public class DeviceImpl extends EObjectImpl implements Device {
 	protected Node tree;
 
 	/**
-	 * The default value of the '{@link #getDeviceId() <em>Device Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getDeviceId() <em>Device Id</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDeviceId()
 	 * @generated
 	 * @ordered
@@ -80,8 +82,8 @@ public class DeviceImpl extends EObjectImpl implements Device {
 	protected static final String DEVICE_ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getDeviceId() <em>Device Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getDeviceId() <em>Device Id</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDeviceId()
 	 * @generated
 	 * @ordered
@@ -89,8 +91,8 @@ public class DeviceImpl extends EObjectImpl implements Device {
 	protected String deviceId = DEVICE_ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLogin() <em>Login</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getLogin() <em>Login</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getLogin()
 	 * @generated
 	 * @ordered
@@ -98,8 +100,8 @@ public class DeviceImpl extends EObjectImpl implements Device {
 	protected static final String LOGIN_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLogin() <em>Login</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getLogin() <em>Login</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getLogin()
 	 * @generated
 	 * @ordered
@@ -107,8 +109,8 @@ public class DeviceImpl extends EObjectImpl implements Device {
 	protected String login = LOGIN_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getPassword() <em>Password</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getPassword() <em>Password</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getPassword()
 	 * @generated
 	 * @ordered
@@ -116,8 +118,8 @@ public class DeviceImpl extends EObjectImpl implements Device {
 	protected static final String PASSWORD_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getPassword() <em>Password</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getPassword() <em>Password</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getPassword()
 	 * @generated
 	 * @ordered
@@ -125,8 +127,8 @@ public class DeviceImpl extends EObjectImpl implements Device {
 	protected String password = PASSWORD_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getServerUrl() <em>Server Url</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getServerUrl() <em>Server Url</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getServerUrl()
 	 * @generated
 	 * @ordered
@@ -134,8 +136,8 @@ public class DeviceImpl extends EObjectImpl implements Device {
 	protected static final String SERVER_URL_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getServerUrl() <em>Server Url</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getServerUrl() <em>Server Url</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getServerUrl()
 	 * @generated
 	 * @ordered
@@ -143,6 +145,26 @@ public class DeviceImpl extends EObjectImpl implements Device {
 	protected String serverUrl = SERVER_URL_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #getAuthentication() <em>Authentication</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAuthentication()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final AuthenticationType AUTHENTICATION_EDEFAULT = AuthenticationType.BASIC;
+
+	/**
+	 * The cached value of the '{@link #getAuthentication() <em>Authentication</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAuthentication()
+	 * @generated
+	 * @ordered
+	 */
+	protected AuthenticationType authentication = AUTHENTICATION_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated NOT
@@ -154,7 +176,6 @@ public class DeviceImpl extends EObjectImpl implements Device {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -164,7 +185,6 @@ public class DeviceImpl extends EObjectImpl implements Device {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -200,7 +220,6 @@ public class DeviceImpl extends EObjectImpl implements Device {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -210,7 +229,6 @@ public class DeviceImpl extends EObjectImpl implements Device {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTree(Node newTree, NotificationChain msgs) {
@@ -218,17 +236,13 @@ public class DeviceImpl extends EObjectImpl implements Device {
 		tree = newTree;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OMADMSimulatorPackage.DEVICE__TREE, oldTree, newTree);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -236,13 +250,13 @@ public class DeviceImpl extends EObjectImpl implements Device {
 		if (newTree != tree) {
 			NotificationChain msgs = null;
 			if (tree != null)
-				msgs = ((InternalEObject) tree).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OMADMSimulatorPackage.DEVICE__TREE, null, msgs);
+				msgs = ((InternalEObject)tree).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OMADMSimulatorPackage.DEVICE__TREE, null, msgs);
 			if (newTree != null)
-				msgs = ((InternalEObject) newTree).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OMADMSimulatorPackage.DEVICE__TREE, null, msgs);
+				msgs = ((InternalEObject)newTree).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OMADMSimulatorPackage.DEVICE__TREE, null, msgs);
 			msgs = basicSetTree(newTree, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, OMADMSimulatorPackage.DEVICE__TREE, newTree, newTree));
 	}
 
@@ -439,136 +453,160 @@ public class DeviceImpl extends EObjectImpl implements Device {
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AuthenticationType getAuthentication() {
+		return authentication;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAuthentication(AuthenticationType newAuthentication) {
+		AuthenticationType oldAuthentication = authentication;
+		authentication = newAuthentication == null ? AUTHENTICATION_EDEFAULT : newAuthentication;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, OMADMSimulatorPackage.DEVICE__AUTHENTICATION, oldAuthentication, authentication));
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case OMADMSimulatorPackage.DEVICE__TREE:
-			return basicSetTree(null, msgs);
+			case OMADMSimulatorPackage.DEVICE__TREE:
+				return basicSetTree(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case OMADMSimulatorPackage.DEVICE__DEVICE_ID_TYPE:
-			return getDeviceIdType();
-		case OMADMSimulatorPackage.DEVICE__TREE:
-			return getTree();
-		case OMADMSimulatorPackage.DEVICE__DEVICE_ID:
-			return getDeviceId();
-		case OMADMSimulatorPackage.DEVICE__LOGIN:
-			return getLogin();
-		case OMADMSimulatorPackage.DEVICE__PASSWORD:
-			return getPassword();
-		case OMADMSimulatorPackage.DEVICE__SERVER_URL:
-			return getServerUrl();
+			case OMADMSimulatorPackage.DEVICE__DEVICE_ID_TYPE:
+				return getDeviceIdType();
+			case OMADMSimulatorPackage.DEVICE__TREE:
+				return getTree();
+			case OMADMSimulatorPackage.DEVICE__DEVICE_ID:
+				return getDeviceId();
+			case OMADMSimulatorPackage.DEVICE__LOGIN:
+				return getLogin();
+			case OMADMSimulatorPackage.DEVICE__PASSWORD:
+				return getPassword();
+			case OMADMSimulatorPackage.DEVICE__SERVER_URL:
+				return getServerUrl();
+			case OMADMSimulatorPackage.DEVICE__AUTHENTICATION:
+				return getAuthentication();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case OMADMSimulatorPackage.DEVICE__DEVICE_ID_TYPE:
-			setDeviceIdType((DeviceIdType) newValue);
-			return;
-		case OMADMSimulatorPackage.DEVICE__TREE:
-			setTree((Node) newValue);
-			return;
-		case OMADMSimulatorPackage.DEVICE__DEVICE_ID:
-			setDeviceId((String) newValue);
-			return;
-		case OMADMSimulatorPackage.DEVICE__LOGIN:
-			setLogin((String) newValue);
-			return;
-		case OMADMSimulatorPackage.DEVICE__PASSWORD:
-			setPassword((String) newValue);
-			return;
-		case OMADMSimulatorPackage.DEVICE__SERVER_URL:
-			setServerUrl((String) newValue);
-			return;
+			case OMADMSimulatorPackage.DEVICE__DEVICE_ID_TYPE:
+				setDeviceIdType((DeviceIdType)newValue);
+				return;
+			case OMADMSimulatorPackage.DEVICE__TREE:
+				setTree((Node)newValue);
+				return;
+			case OMADMSimulatorPackage.DEVICE__DEVICE_ID:
+				setDeviceId((String)newValue);
+				return;
+			case OMADMSimulatorPackage.DEVICE__LOGIN:
+				setLogin((String)newValue);
+				return;
+			case OMADMSimulatorPackage.DEVICE__PASSWORD:
+				setPassword((String)newValue);
+				return;
+			case OMADMSimulatorPackage.DEVICE__SERVER_URL:
+				setServerUrl((String)newValue);
+				return;
+			case OMADMSimulatorPackage.DEVICE__AUTHENTICATION:
+				setAuthentication((AuthenticationType)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case OMADMSimulatorPackage.DEVICE__DEVICE_ID_TYPE:
-			setDeviceIdType(DEVICE_ID_TYPE_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.DEVICE__TREE:
-			setTree((Node) null);
-			return;
-		case OMADMSimulatorPackage.DEVICE__DEVICE_ID:
-			setDeviceId(DEVICE_ID_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.DEVICE__LOGIN:
-			setLogin(LOGIN_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.DEVICE__PASSWORD:
-			setPassword(PASSWORD_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.DEVICE__SERVER_URL:
-			setServerUrl(SERVER_URL_EDEFAULT);
-			return;
+			case OMADMSimulatorPackage.DEVICE__DEVICE_ID_TYPE:
+				setDeviceIdType(DEVICE_ID_TYPE_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.DEVICE__TREE:
+				setTree((Node)null);
+				return;
+			case OMADMSimulatorPackage.DEVICE__DEVICE_ID:
+				setDeviceId(DEVICE_ID_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.DEVICE__LOGIN:
+				setLogin(LOGIN_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.DEVICE__PASSWORD:
+				setPassword(PASSWORD_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.DEVICE__SERVER_URL:
+				setServerUrl(SERVER_URL_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.DEVICE__AUTHENTICATION:
+				setAuthentication(AUTHENTICATION_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case OMADMSimulatorPackage.DEVICE__DEVICE_ID_TYPE:
-			return deviceIdType != DEVICE_ID_TYPE_EDEFAULT;
-		case OMADMSimulatorPackage.DEVICE__TREE:
-			return tree != null;
-		case OMADMSimulatorPackage.DEVICE__DEVICE_ID:
-			return DEVICE_ID_EDEFAULT == null ? deviceId != null : !DEVICE_ID_EDEFAULT.equals(deviceId);
-		case OMADMSimulatorPackage.DEVICE__LOGIN:
-			return LOGIN_EDEFAULT == null ? login != null : !LOGIN_EDEFAULT.equals(login);
-		case OMADMSimulatorPackage.DEVICE__PASSWORD:
-			return PASSWORD_EDEFAULT == null ? password != null : !PASSWORD_EDEFAULT.equals(password);
-		case OMADMSimulatorPackage.DEVICE__SERVER_URL:
-			return SERVER_URL_EDEFAULT == null ? serverUrl != null : !SERVER_URL_EDEFAULT.equals(serverUrl);
+			case OMADMSimulatorPackage.DEVICE__DEVICE_ID_TYPE:
+				return deviceIdType != DEVICE_ID_TYPE_EDEFAULT;
+			case OMADMSimulatorPackage.DEVICE__TREE:
+				return tree != null;
+			case OMADMSimulatorPackage.DEVICE__DEVICE_ID:
+				return DEVICE_ID_EDEFAULT == null ? deviceId != null : !DEVICE_ID_EDEFAULT.equals(deviceId);
+			case OMADMSimulatorPackage.DEVICE__LOGIN:
+				return LOGIN_EDEFAULT == null ? login != null : !LOGIN_EDEFAULT.equals(login);
+			case OMADMSimulatorPackage.DEVICE__PASSWORD:
+				return PASSWORD_EDEFAULT == null ? password != null : !PASSWORD_EDEFAULT.equals(password);
+			case OMADMSimulatorPackage.DEVICE__SERVER_URL:
+				return SERVER_URL_EDEFAULT == null ? serverUrl != null : !SERVER_URL_EDEFAULT.equals(serverUrl);
+			case OMADMSimulatorPackage.DEVICE__AUTHENTICATION:
+				return authentication != AUTHENTICATION_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (deviceIdType: ");
@@ -581,6 +619,8 @@ public class DeviceImpl extends EObjectImpl implements Device {
 		result.append(password);
 		result.append(", serverUrl: ");
 		result.append(serverUrl);
+		result.append(", authentication: ");
+		result.append(authentication);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/NodeImpl.java b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/NodeImpl.java
index 8551cd7..f7c3288 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/NodeImpl.java
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/NodeImpl.java
@@ -36,33 +36,33 @@ import org.eclipse.koneki.simulators.omadm.model.util.NodeHelpers;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getFormat <em>Format</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getChildren <em>Children</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getData <em>Data</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getParent <em>Parent</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getGetManagement <em>Get Management</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getGetCode <em>Get Code</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getAddManagement <em>Add Management</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getDeleteManagement <em>Delete Management</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getCopyManagement <em>Copy Management</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getReplaceManagement <em>Replace Management</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getExecManagement <em>Exec Management</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getAddCode <em>Add Code</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getDeleteCode <em>Delete Code</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getCopyCode <em>Copy Code</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getReplaceCode <em>Replace Code</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getExecCode <em>Exec Code</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getFormat <em>Format</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getChildren <em>Children</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getData <em>Data</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getGetManagement <em>Get Management</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getGetCode <em>Get Code</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getAddManagement <em>Add Management</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getDeleteManagement <em>Delete Management</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getCopyManagement <em>Copy Management</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getReplaceManagement <em>Replace Management</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getExecManagement <em>Exec Management</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getAddCode <em>Add Code</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getDeleteCode <em>Delete Code</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getCopyCode <em>Copy Code</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getReplaceCode <em>Replace Code</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.impl.NodeImpl#getExecCode <em>Exec Code</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class NodeImpl extends EObjectImpl implements Node {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -70,8 +70,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -79,8 +79,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getFormat() <em>Format</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getFormat() <em>Format</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getFormat()
 	 * @generated
 	 * @ordered
@@ -88,8 +88,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final NodeFormat FORMAT_EDEFAULT = NodeFormat.CHR;
 
 	/**
-	 * The cached value of the '{@link #getFormat() <em>Format</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getFormat() <em>Format</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getFormat()
 	 * @generated
 	 * @ordered
@@ -97,8 +97,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected NodeFormat format = FORMAT_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getChildren()
 	 * @generated
 	 * @ordered
@@ -106,8 +106,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected EList<Node> children;
 
 	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -115,8 +115,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final String TYPE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -124,8 +124,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected String type = TYPE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getData() <em>Data</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getData() <em>Data</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getData()
 	 * @generated
 	 * @ordered
@@ -133,8 +133,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final String DATA_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getData() <em>Data</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getData() <em>Data</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getData()
 	 * @generated
 	 * @ordered
@@ -142,8 +142,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected String data = DATA_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getGetManagement() <em>Get Management</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getGetManagement() <em>Get Management</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getGetManagement()
 	 * @generated
 	 * @ordered
@@ -151,8 +151,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final CommandManagement GET_MANAGEMENT_EDEFAULT = CommandManagement.INHERITED;
 
 	/**
-	 * The cached value of the '{@link #getGetManagement() <em>Get Management</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getGetManagement() <em>Get Management</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getGetManagement()
 	 * @generated
 	 * @ordered
@@ -160,8 +160,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected CommandManagement getManagement = GET_MANAGEMENT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getGetCode() <em>Get Code</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getGetCode() <em>Get Code</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getGetCode()
 	 * @generated
 	 * @ordered
@@ -169,8 +169,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final int GET_CODE_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getGetCode() <em>Get Code</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getGetCode() <em>Get Code</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getGetCode()
 	 * @generated
 	 * @ordered
@@ -178,8 +178,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected int getCode = GET_CODE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getAddManagement() <em>Add Management</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getAddManagement() <em>Add Management</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getAddManagement()
 	 * @generated
 	 * @ordered
@@ -187,8 +187,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final CommandManagement ADD_MANAGEMENT_EDEFAULT = CommandManagement.INHERITED;
 
 	/**
-	 * The cached value of the '{@link #getAddManagement() <em>Add Management</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getAddManagement() <em>Add Management</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getAddManagement()
 	 * @generated
 	 * @ordered
@@ -196,8 +196,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected CommandManagement addManagement = ADD_MANAGEMENT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDeleteManagement() <em>Delete Management</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getDeleteManagement() <em>Delete Management</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDeleteManagement()
 	 * @generated
 	 * @ordered
@@ -205,8 +205,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final CommandManagement DELETE_MANAGEMENT_EDEFAULT = CommandManagement.INHERITED;
 
 	/**
-	 * The cached value of the '{@link #getDeleteManagement() <em>Delete Management</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getDeleteManagement() <em>Delete Management</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDeleteManagement()
 	 * @generated
 	 * @ordered
@@ -214,8 +214,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected CommandManagement deleteManagement = DELETE_MANAGEMENT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCopyManagement() <em>Copy Management</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getCopyManagement() <em>Copy Management</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getCopyManagement()
 	 * @generated
 	 * @ordered
@@ -223,8 +223,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final CommandManagement COPY_MANAGEMENT_EDEFAULT = CommandManagement.INHERITED;
 
 	/**
-	 * The cached value of the '{@link #getCopyManagement() <em>Copy Management</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getCopyManagement() <em>Copy Management</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getCopyManagement()
 	 * @generated
 	 * @ordered
@@ -232,8 +232,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected CommandManagement copyManagement = COPY_MANAGEMENT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getReplaceManagement() <em>Replace Management</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getReplaceManagement() <em>Replace Management</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getReplaceManagement()
 	 * @generated
 	 * @ordered
@@ -241,8 +241,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final CommandManagement REPLACE_MANAGEMENT_EDEFAULT = CommandManagement.INHERITED;
 
 	/**
-	 * The cached value of the '{@link #getReplaceManagement() <em>Replace Management</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getReplaceManagement() <em>Replace Management</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getReplaceManagement()
 	 * @generated
 	 * @ordered
@@ -250,8 +250,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected CommandManagement replaceManagement = REPLACE_MANAGEMENT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getExecManagement() <em>Exec Management</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getExecManagement() <em>Exec Management</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getExecManagement()
 	 * @generated
 	 * @ordered
@@ -259,8 +259,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final CommandManagement EXEC_MANAGEMENT_EDEFAULT = CommandManagement.INHERITED;
 
 	/**
-	 * The cached value of the '{@link #getExecManagement() <em>Exec Management</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getExecManagement() <em>Exec Management</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getExecManagement()
 	 * @generated
 	 * @ordered
@@ -268,8 +268,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected CommandManagement execManagement = EXEC_MANAGEMENT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getAddCode() <em>Add Code</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getAddCode() <em>Add Code</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getAddCode()
 	 * @generated
 	 * @ordered
@@ -277,8 +277,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final int ADD_CODE_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getAddCode() <em>Add Code</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getAddCode() <em>Add Code</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getAddCode()
 	 * @generated
 	 * @ordered
@@ -286,8 +286,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected int addCode = ADD_CODE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDeleteCode() <em>Delete Code</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getDeleteCode() <em>Delete Code</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDeleteCode()
 	 * @generated
 	 * @ordered
@@ -295,8 +295,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final int DELETE_CODE_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getDeleteCode() <em>Delete Code</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getDeleteCode() <em>Delete Code</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDeleteCode()
 	 * @generated
 	 * @ordered
@@ -304,8 +304,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected int deleteCode = DELETE_CODE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCopyCode() <em>Copy Code</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getCopyCode() <em>Copy Code</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getCopyCode()
 	 * @generated
 	 * @ordered
@@ -313,8 +313,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final int COPY_CODE_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getCopyCode() <em>Copy Code</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getCopyCode() <em>Copy Code</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getCopyCode()
 	 * @generated
 	 * @ordered
@@ -322,8 +322,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected int copyCode = COPY_CODE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getReplaceCode() <em>Replace Code</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getReplaceCode() <em>Replace Code</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getReplaceCode()
 	 * @generated
 	 * @ordered
@@ -331,8 +331,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final int REPLACE_CODE_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getReplaceCode() <em>Replace Code</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getReplaceCode() <em>Replace Code</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getReplaceCode()
 	 * @generated
 	 * @ordered
@@ -340,8 +340,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected int replaceCode = REPLACE_CODE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getExecCode() <em>Exec Code</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getExecCode() <em>Exec Code</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getExecCode()
 	 * @generated
 	 * @ordered
@@ -349,8 +349,8 @@ public class NodeImpl extends EObjectImpl implements Node {
 	protected static final int EXEC_CODE_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getExecCode() <em>Exec Code</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getExecCode() <em>Exec Code</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getExecCode()
 	 * @generated
 	 * @ordered
@@ -359,7 +359,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected NodeImpl() {
@@ -368,7 +367,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -378,7 +376,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -387,7 +384,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
@@ -399,7 +395,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NodeFormat getFormat() {
@@ -408,7 +403,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setFormat(NodeFormat newFormat) {
@@ -420,20 +414,17 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<Node> getChildren() {
 		if (children == null) {
-			children = new EObjectContainmentWithInverseEList<Node>(Node.class, this, OMADMSimulatorPackage.NODE__CHILDREN,
-					OMADMSimulatorPackage.NODE__PARENT);
+			children = new EObjectContainmentWithInverseEList<Node>(Node.class, this, OMADMSimulatorPackage.NODE__CHILDREN, OMADMSimulatorPackage.NODE__PARENT);
 		}
 		return children;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getType() {
@@ -442,7 +433,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setType(String newType) {
@@ -454,7 +444,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getData() {
@@ -566,28 +555,24 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Node getParent() {
-		if (eContainerFeatureID() != OMADMSimulatorPackage.NODE__PARENT)
-			return null;
-		return (Node) eContainer();
+		if (eContainerFeatureID() != OMADMSimulatorPackage.NODE__PARENT) return null;
+		return (Node)eContainer();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetParent(Node newParent, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject) newParent, OMADMSimulatorPackage.NODE__PARENT, msgs);
+		msgs = eBasicSetContainer((InternalEObject)newParent, OMADMSimulatorPackage.NODE__PARENT, msgs);
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setParent(Node newParent) {
@@ -598,17 +583,16 @@ public class NodeImpl extends EObjectImpl implements Node {
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newParent != null)
-				msgs = ((InternalEObject) newParent).eInverseAdd(this, OMADMSimulatorPackage.NODE__CHILDREN, Node.class, msgs);
+				msgs = ((InternalEObject)newParent).eInverseAdd(this, OMADMSimulatorPackage.NODE__CHILDREN, Node.class, msgs);
 			msgs = basicSetParent(newParent, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, OMADMSimulatorPackage.NODE__PARENT, newParent, newParent));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public CommandManagement getGetManagement() {
@@ -617,7 +601,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setGetManagement(CommandManagement newGetManagement) {
@@ -629,7 +612,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public int getGetCode() {
@@ -638,7 +620,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setGetCode(int newGetCode) {
@@ -650,7 +631,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public CommandManagement getAddManagement() {
@@ -659,7 +639,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setAddManagement(CommandManagement newAddManagement) {
@@ -671,7 +650,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public CommandManagement getDeleteManagement() {
@@ -680,20 +658,17 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setDeleteManagement(CommandManagement newDeleteManagement) {
 		CommandManagement oldDeleteManagement = deleteManagement;
 		deleteManagement = newDeleteManagement == null ? DELETE_MANAGEMENT_EDEFAULT : newDeleteManagement;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OMADMSimulatorPackage.NODE__DELETE_MANAGEMENT, oldDeleteManagement,
-					deleteManagement));
+			eNotify(new ENotificationImpl(this, Notification.SET, OMADMSimulatorPackage.NODE__DELETE_MANAGEMENT, oldDeleteManagement, deleteManagement));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public CommandManagement getCopyManagement() {
@@ -702,7 +677,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setCopyManagement(CommandManagement newCopyManagement) {
@@ -714,7 +688,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public CommandManagement getReplaceManagement() {
@@ -723,20 +696,17 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setReplaceManagement(CommandManagement newReplaceManagement) {
 		CommandManagement oldReplaceManagement = replaceManagement;
 		replaceManagement = newReplaceManagement == null ? REPLACE_MANAGEMENT_EDEFAULT : newReplaceManagement;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, OMADMSimulatorPackage.NODE__REPLACE_MANAGEMENT, oldReplaceManagement,
-					replaceManagement));
+			eNotify(new ENotificationImpl(this, Notification.SET, OMADMSimulatorPackage.NODE__REPLACE_MANAGEMENT, oldReplaceManagement, replaceManagement));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public CommandManagement getExecManagement() {
@@ -745,7 +715,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setExecManagement(CommandManagement newExecManagement) {
@@ -757,7 +726,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public int getAddCode() {
@@ -766,7 +734,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setAddCode(int newAddCode) {
@@ -778,7 +745,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public int getDeleteCode() {
@@ -787,7 +753,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setDeleteCode(int newDeleteCode) {
@@ -799,7 +764,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public int getCopyCode() {
@@ -808,7 +772,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setCopyCode(int newCopyCode) {
@@ -820,7 +783,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public int getReplaceCode() {
@@ -829,7 +791,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setReplaceCode(int newReplaceCode) {
@@ -841,7 +802,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public int getExecCode() {
@@ -850,7 +810,6 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setExecCode(int newExecCode) {
@@ -1073,292 +1032,283 @@ public class NodeImpl extends EObjectImpl implements Node {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case OMADMSimulatorPackage.NODE__CHILDREN:
-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getChildren()).basicAdd(otherEnd, msgs);
-		case OMADMSimulatorPackage.NODE__PARENT:
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetParent((Node) otherEnd, msgs);
+			case OMADMSimulatorPackage.NODE__CHILDREN:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+			case OMADMSimulatorPackage.NODE__PARENT:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetParent((Node)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case OMADMSimulatorPackage.NODE__CHILDREN:
-			return ((InternalEList<?>) getChildren()).basicRemove(otherEnd, msgs);
-		case OMADMSimulatorPackage.NODE__PARENT:
-			return basicSetParent(null, msgs);
+			case OMADMSimulatorPackage.NODE__CHILDREN:
+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+			case OMADMSimulatorPackage.NODE__PARENT:
+				return basicSetParent(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
 		switch (eContainerFeatureID()) {
-		case OMADMSimulatorPackage.NODE__PARENT:
-			return eInternalContainer().eInverseRemove(this, OMADMSimulatorPackage.NODE__CHILDREN, Node.class, msgs);
+			case OMADMSimulatorPackage.NODE__PARENT:
+				return eInternalContainer().eInverseRemove(this, OMADMSimulatorPackage.NODE__CHILDREN, Node.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case OMADMSimulatorPackage.NODE__NAME:
-			return getName();
-		case OMADMSimulatorPackage.NODE__FORMAT:
-			return getFormat();
-		case OMADMSimulatorPackage.NODE__CHILDREN:
-			return getChildren();
-		case OMADMSimulatorPackage.NODE__TYPE:
-			return getType();
-		case OMADMSimulatorPackage.NODE__DATA:
-			return getData();
-		case OMADMSimulatorPackage.NODE__PARENT:
-			return getParent();
-		case OMADMSimulatorPackage.NODE__GET_MANAGEMENT:
-			return getGetManagement();
-		case OMADMSimulatorPackage.NODE__GET_CODE:
-			return getGetCode();
-		case OMADMSimulatorPackage.NODE__ADD_MANAGEMENT:
-			return getAddManagement();
-		case OMADMSimulatorPackage.NODE__DELETE_MANAGEMENT:
-			return getDeleteManagement();
-		case OMADMSimulatorPackage.NODE__COPY_MANAGEMENT:
-			return getCopyManagement();
-		case OMADMSimulatorPackage.NODE__REPLACE_MANAGEMENT:
-			return getReplaceManagement();
-		case OMADMSimulatorPackage.NODE__EXEC_MANAGEMENT:
-			return getExecManagement();
-		case OMADMSimulatorPackage.NODE__ADD_CODE:
-			return getAddCode();
-		case OMADMSimulatorPackage.NODE__DELETE_CODE:
-			return getDeleteCode();
-		case OMADMSimulatorPackage.NODE__COPY_CODE:
-			return getCopyCode();
-		case OMADMSimulatorPackage.NODE__REPLACE_CODE:
-			return getReplaceCode();
-		case OMADMSimulatorPackage.NODE__EXEC_CODE:
-			return getExecCode();
+			case OMADMSimulatorPackage.NODE__NAME:
+				return getName();
+			case OMADMSimulatorPackage.NODE__FORMAT:
+				return getFormat();
+			case OMADMSimulatorPackage.NODE__CHILDREN:
+				return getChildren();
+			case OMADMSimulatorPackage.NODE__TYPE:
+				return getType();
+			case OMADMSimulatorPackage.NODE__DATA:
+				return getData();
+			case OMADMSimulatorPackage.NODE__PARENT:
+				return getParent();
+			case OMADMSimulatorPackage.NODE__GET_MANAGEMENT:
+				return getGetManagement();
+			case OMADMSimulatorPackage.NODE__GET_CODE:
+				return getGetCode();
+			case OMADMSimulatorPackage.NODE__ADD_MANAGEMENT:
+				return getAddManagement();
+			case OMADMSimulatorPackage.NODE__DELETE_MANAGEMENT:
+				return getDeleteManagement();
+			case OMADMSimulatorPackage.NODE__COPY_MANAGEMENT:
+				return getCopyManagement();
+			case OMADMSimulatorPackage.NODE__REPLACE_MANAGEMENT:
+				return getReplaceManagement();
+			case OMADMSimulatorPackage.NODE__EXEC_MANAGEMENT:
+				return getExecManagement();
+			case OMADMSimulatorPackage.NODE__ADD_CODE:
+				return getAddCode();
+			case OMADMSimulatorPackage.NODE__DELETE_CODE:
+				return getDeleteCode();
+			case OMADMSimulatorPackage.NODE__COPY_CODE:
+				return getCopyCode();
+			case OMADMSimulatorPackage.NODE__REPLACE_CODE:
+				return getReplaceCode();
+			case OMADMSimulatorPackage.NODE__EXEC_CODE:
+				return getExecCode();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case OMADMSimulatorPackage.NODE__NAME:
-			setName((String) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__FORMAT:
-			setFormat((NodeFormat) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__CHILDREN:
-			getChildren().clear();
-			getChildren().addAll((Collection<? extends Node>) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__TYPE:
-			setType((String) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__DATA:
-			setData((String) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__PARENT:
-			setParent((Node) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__GET_MANAGEMENT:
-			setGetManagement((CommandManagement) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__GET_CODE:
-			setGetCode((Integer) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__ADD_MANAGEMENT:
-			setAddManagement((CommandManagement) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__DELETE_MANAGEMENT:
-			setDeleteManagement((CommandManagement) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__COPY_MANAGEMENT:
-			setCopyManagement((CommandManagement) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__REPLACE_MANAGEMENT:
-			setReplaceManagement((CommandManagement) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__EXEC_MANAGEMENT:
-			setExecManagement((CommandManagement) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__ADD_CODE:
-			setAddCode((Integer) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__DELETE_CODE:
-			setDeleteCode((Integer) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__COPY_CODE:
-			setCopyCode((Integer) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__REPLACE_CODE:
-			setReplaceCode((Integer) newValue);
-			return;
-		case OMADMSimulatorPackage.NODE__EXEC_CODE:
-			setExecCode((Integer) newValue);
-			return;
+			case OMADMSimulatorPackage.NODE__NAME:
+				setName((String)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__FORMAT:
+				setFormat((NodeFormat)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__CHILDREN:
+				getChildren().clear();
+				getChildren().addAll((Collection<? extends Node>)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__TYPE:
+				setType((String)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__DATA:
+				setData((String)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__PARENT:
+				setParent((Node)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__GET_MANAGEMENT:
+				setGetManagement((CommandManagement)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__GET_CODE:
+				setGetCode((Integer)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__ADD_MANAGEMENT:
+				setAddManagement((CommandManagement)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__DELETE_MANAGEMENT:
+				setDeleteManagement((CommandManagement)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__COPY_MANAGEMENT:
+				setCopyManagement((CommandManagement)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__REPLACE_MANAGEMENT:
+				setReplaceManagement((CommandManagement)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__EXEC_MANAGEMENT:
+				setExecManagement((CommandManagement)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__ADD_CODE:
+				setAddCode((Integer)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__DELETE_CODE:
+				setDeleteCode((Integer)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__COPY_CODE:
+				setCopyCode((Integer)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__REPLACE_CODE:
+				setReplaceCode((Integer)newValue);
+				return;
+			case OMADMSimulatorPackage.NODE__EXEC_CODE:
+				setExecCode((Integer)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case OMADMSimulatorPackage.NODE__NAME:
-			setName(NAME_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__FORMAT:
-			setFormat(FORMAT_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__CHILDREN:
-			getChildren().clear();
-			return;
-		case OMADMSimulatorPackage.NODE__TYPE:
-			setType(TYPE_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__DATA:
-			setData(DATA_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__PARENT:
-			setParent((Node) null);
-			return;
-		case OMADMSimulatorPackage.NODE__GET_MANAGEMENT:
-			setGetManagement(GET_MANAGEMENT_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__GET_CODE:
-			setGetCode(GET_CODE_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__ADD_MANAGEMENT:
-			setAddManagement(ADD_MANAGEMENT_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__DELETE_MANAGEMENT:
-			setDeleteManagement(DELETE_MANAGEMENT_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__COPY_MANAGEMENT:
-			setCopyManagement(COPY_MANAGEMENT_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__REPLACE_MANAGEMENT:
-			setReplaceManagement(REPLACE_MANAGEMENT_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__EXEC_MANAGEMENT:
-			setExecManagement(EXEC_MANAGEMENT_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__ADD_CODE:
-			setAddCode(ADD_CODE_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__DELETE_CODE:
-			setDeleteCode(DELETE_CODE_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__COPY_CODE:
-			setCopyCode(COPY_CODE_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__REPLACE_CODE:
-			setReplaceCode(REPLACE_CODE_EDEFAULT);
-			return;
-		case OMADMSimulatorPackage.NODE__EXEC_CODE:
-			setExecCode(EXEC_CODE_EDEFAULT);
-			return;
+			case OMADMSimulatorPackage.NODE__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__FORMAT:
+				setFormat(FORMAT_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__CHILDREN:
+				getChildren().clear();
+				return;
+			case OMADMSimulatorPackage.NODE__TYPE:
+				setType(TYPE_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__DATA:
+				setData(DATA_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__PARENT:
+				setParent((Node)null);
+				return;
+			case OMADMSimulatorPackage.NODE__GET_MANAGEMENT:
+				setGetManagement(GET_MANAGEMENT_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__GET_CODE:
+				setGetCode(GET_CODE_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__ADD_MANAGEMENT:
+				setAddManagement(ADD_MANAGEMENT_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__DELETE_MANAGEMENT:
+				setDeleteManagement(DELETE_MANAGEMENT_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__COPY_MANAGEMENT:
+				setCopyManagement(COPY_MANAGEMENT_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__REPLACE_MANAGEMENT:
+				setReplaceManagement(REPLACE_MANAGEMENT_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__EXEC_MANAGEMENT:
+				setExecManagement(EXEC_MANAGEMENT_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__ADD_CODE:
+				setAddCode(ADD_CODE_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__DELETE_CODE:
+				setDeleteCode(DELETE_CODE_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__COPY_CODE:
+				setCopyCode(COPY_CODE_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__REPLACE_CODE:
+				setReplaceCode(REPLACE_CODE_EDEFAULT);
+				return;
+			case OMADMSimulatorPackage.NODE__EXEC_CODE:
+				setExecCode(EXEC_CODE_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case OMADMSimulatorPackage.NODE__NAME:
-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		case OMADMSimulatorPackage.NODE__FORMAT:
-			return format != FORMAT_EDEFAULT;
-		case OMADMSimulatorPackage.NODE__CHILDREN:
-			return children != null && !children.isEmpty();
-		case OMADMSimulatorPackage.NODE__TYPE:
-			return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-		case OMADMSimulatorPackage.NODE__DATA:
-			return DATA_EDEFAULT == null ? data != null : !DATA_EDEFAULT.equals(data);
-		case OMADMSimulatorPackage.NODE__PARENT:
-			return getParent() != null;
-		case OMADMSimulatorPackage.NODE__GET_MANAGEMENT:
-			return getManagement != GET_MANAGEMENT_EDEFAULT;
-		case OMADMSimulatorPackage.NODE__GET_CODE:
-			return getCode != GET_CODE_EDEFAULT;
-		case OMADMSimulatorPackage.NODE__ADD_MANAGEMENT:
-			return addManagement != ADD_MANAGEMENT_EDEFAULT;
-		case OMADMSimulatorPackage.NODE__DELETE_MANAGEMENT:
-			return deleteManagement != DELETE_MANAGEMENT_EDEFAULT;
-		case OMADMSimulatorPackage.NODE__COPY_MANAGEMENT:
-			return copyManagement != COPY_MANAGEMENT_EDEFAULT;
-		case OMADMSimulatorPackage.NODE__REPLACE_MANAGEMENT:
-			return replaceManagement != REPLACE_MANAGEMENT_EDEFAULT;
-		case OMADMSimulatorPackage.NODE__EXEC_MANAGEMENT:
-			return execManagement != EXEC_MANAGEMENT_EDEFAULT;
-		case OMADMSimulatorPackage.NODE__ADD_CODE:
-			return addCode != ADD_CODE_EDEFAULT;
-		case OMADMSimulatorPackage.NODE__DELETE_CODE:
-			return deleteCode != DELETE_CODE_EDEFAULT;
-		case OMADMSimulatorPackage.NODE__COPY_CODE:
-			return copyCode != COPY_CODE_EDEFAULT;
-		case OMADMSimulatorPackage.NODE__REPLACE_CODE:
-			return replaceCode != REPLACE_CODE_EDEFAULT;
-		case OMADMSimulatorPackage.NODE__EXEC_CODE:
-			return execCode != EXEC_CODE_EDEFAULT;
+			case OMADMSimulatorPackage.NODE__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case OMADMSimulatorPackage.NODE__FORMAT:
+				return format != FORMAT_EDEFAULT;
+			case OMADMSimulatorPackage.NODE__CHILDREN:
+				return children != null && !children.isEmpty();
+			case OMADMSimulatorPackage.NODE__TYPE:
+				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+			case OMADMSimulatorPackage.NODE__DATA:
+				return DATA_EDEFAULT == null ? data != null : !DATA_EDEFAULT.equals(data);
+			case OMADMSimulatorPackage.NODE__PARENT:
+				return getParent() != null;
+			case OMADMSimulatorPackage.NODE__GET_MANAGEMENT:
+				return getManagement != GET_MANAGEMENT_EDEFAULT;
+			case OMADMSimulatorPackage.NODE__GET_CODE:
+				return getCode != GET_CODE_EDEFAULT;
+			case OMADMSimulatorPackage.NODE__ADD_MANAGEMENT:
+				return addManagement != ADD_MANAGEMENT_EDEFAULT;
+			case OMADMSimulatorPackage.NODE__DELETE_MANAGEMENT:
+				return deleteManagement != DELETE_MANAGEMENT_EDEFAULT;
+			case OMADMSimulatorPackage.NODE__COPY_MANAGEMENT:
+				return copyManagement != COPY_MANAGEMENT_EDEFAULT;
+			case OMADMSimulatorPackage.NODE__REPLACE_MANAGEMENT:
+				return replaceManagement != REPLACE_MANAGEMENT_EDEFAULT;
+			case OMADMSimulatorPackage.NODE__EXEC_MANAGEMENT:
+				return execManagement != EXEC_MANAGEMENT_EDEFAULT;
+			case OMADMSimulatorPackage.NODE__ADD_CODE:
+				return addCode != ADD_CODE_EDEFAULT;
+			case OMADMSimulatorPackage.NODE__DELETE_CODE:
+				return deleteCode != DELETE_CODE_EDEFAULT;
+			case OMADMSimulatorPackage.NODE__COPY_CODE:
+				return copyCode != COPY_CODE_EDEFAULT;
+			case OMADMSimulatorPackage.NODE__REPLACE_CODE:
+				return replaceCode != REPLACE_CODE_EDEFAULT;
+			case OMADMSimulatorPackage.NODE__EXEC_CODE:
+				return execCode != EXEC_CODE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/OMADMSimulatorFactoryImpl.java b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/OMADMSimulatorFactoryImpl.java
index 9aae251..6549d04 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/OMADMSimulatorFactoryImpl.java
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/OMADMSimulatorFactoryImpl.java
@@ -87,6 +87,8 @@ public class OMADMSimulatorFactoryImpl extends EFactoryImpl implements OMADMSimu
 				return createNodeFormatFromString(eDataType, initialValue);
 			case OMADMSimulatorPackage.COMMAND_MANAGEMENT:
 				return createCommandManagementFromString(eDataType, initialValue);
+			case OMADMSimulatorPackage.AUTHENTICATION_TYPE:
+				return createAuthenticationTypeFromString(eDataType, initialValue);
 			default:
 				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
@@ -105,6 +107,8 @@ public class OMADMSimulatorFactoryImpl extends EFactoryImpl implements OMADMSimu
 				return convertNodeFormatToString(eDataType, instanceValue);
 			case OMADMSimulatorPackage.COMMAND_MANAGEMENT:
 				return convertCommandManagementToString(eDataType, instanceValue);
+			case OMADMSimulatorPackage.AUTHENTICATION_TYPE:
+				return convertAuthenticationTypeToString(eDataType, instanceValue);
 			default:
 				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
@@ -192,6 +196,26 @@ public class OMADMSimulatorFactoryImpl extends EFactoryImpl implements OMADMSimu
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AuthenticationType createAuthenticationTypeFromString(EDataType eDataType, String initialValue) {
+		AuthenticationType result = AuthenticationType.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertAuthenticationTypeToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/OMADMSimulatorPackageImpl.java b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/OMADMSimulatorPackageImpl.java
index 71b5da5..f4962ad 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/OMADMSimulatorPackageImpl.java
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/impl/OMADMSimulatorPackageImpl.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EValidator;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.koneki.simulators.omadm.model.AuthenticationType;
 import org.eclipse.koneki.simulators.omadm.model.CommandManagement;
 import org.eclipse.koneki.simulators.omadm.model.Device;
 import org.eclipse.koneki.simulators.omadm.model.DeviceIdType;
@@ -70,6 +71,13 @@ public class OMADMSimulatorPackageImpl extends EPackageImpl implements OMADMSimu
 	private EEnum commandManagementEEnum = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum authenticationTypeEEnum = null;
+
+	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
 	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
@@ -214,6 +222,15 @@ public class OMADMSimulatorPackageImpl extends EPackageImpl implements OMADMSimu
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDevice_Authentication() {
+		return (EAttribute)deviceEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
@@ -390,6 +407,15 @@ public class OMADMSimulatorPackageImpl extends EPackageImpl implements OMADMSimu
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EEnum getAuthenticationType() {
+		return authenticationTypeEEnum;
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
@@ -425,6 +451,7 @@ public class OMADMSimulatorPackageImpl extends EPackageImpl implements OMADMSimu
 		createEAttribute(deviceEClass, DEVICE__LOGIN);
 		createEAttribute(deviceEClass, DEVICE__PASSWORD);
 		createEAttribute(deviceEClass, DEVICE__SERVER_URL);
+		createEAttribute(deviceEClass, DEVICE__AUTHENTICATION);
 
 		nodeEClass = createEClass(NODE);
 		createEAttribute(nodeEClass, NODE__NAME);
@@ -450,6 +477,7 @@ public class OMADMSimulatorPackageImpl extends EPackageImpl implements OMADMSimu
 		deviceIdTypeEEnum = createEEnum(DEVICE_ID_TYPE);
 		nodeFormatEEnum = createEEnum(NODE_FORMAT);
 		commandManagementEEnum = createEEnum(COMMAND_MANAGEMENT);
+		authenticationTypeEEnum = createEEnum(AUTHENTICATION_TYPE);
 	}
 
 	/**
@@ -490,6 +518,7 @@ public class OMADMSimulatorPackageImpl extends EPackageImpl implements OMADMSimu
 		initEAttribute(getDevice_Login(), ecorePackage.getEString(), "login", null, 0, 1, Device.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 		initEAttribute(getDevice_Password(), ecorePackage.getEString(), "password", null, 0, 1, Device.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 		initEAttribute(getDevice_ServerUrl(), ecorePackage.getEString(), "serverUrl", null, 1, 1, Device.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDevice_Authentication(), this.getAuthenticationType(), "authentication", null, 1, 1, Device.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(nodeEClass, Node.class, "Node", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getNode_Name(), ecorePackage.getEString(), "name", null, 1, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -570,6 +599,10 @@ public class OMADMSimulatorPackageImpl extends EPackageImpl implements OMADMSimu
 		addEEnumLiteral(commandManagementEEnum, CommandManagement.MANUAL);
 		addEEnumLiteral(commandManagementEEnum, CommandManagement.CONSTANT);
 
+		initEEnum(authenticationTypeEEnum, AuthenticationType.class, "AuthenticationType");
+		addEEnumLiteral(authenticationTypeEEnum, AuthenticationType.BASIC);
+		addEEnumLiteral(authenticationTypeEEnum, AuthenticationType.NONE);
+
 		// Create resource
 		createResource(eNS_URI);
 
diff --git a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/util/OMADMSimulatorValidator.java b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/util/OMADMSimulatorValidator.java
index 9e2fcca..f9956ca 100644
--- a/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/util/OMADMSimulatorValidator.java
+++ b/omadm/bundles/org.eclipse.koneki.simulators.omadm.model/src/org/eclipse/koneki/simulators/omadm/model/util/OMADMSimulatorValidator.java
@@ -29,6 +29,7 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.koneki.simulators.omadm.model.*;
 import org.eclipse.koneki.simulators.omadm.model.CommandManagement;
 import org.eclipse.koneki.simulators.omadm.model.Device;
 import org.eclipse.koneki.simulators.omadm.model.DeviceIdType;
@@ -40,22 +41,20 @@ import org.eclipse.koneki.simulators.omadm.model.internal.OMADMSimulationModelPl
 
 /**
  * <!-- begin-user-doc --> The <b>Validator</b> for the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.koneki.simulators.omadm.model.OMADMSimulatorPackage
  * @generated
  */
 public class OMADMSimulatorValidator extends EObjectValidator {
 	/**
-	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached model package
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static final OMADMSimulatorValidator INSTANCE = new OMADMSimulatorValidator();
 
 	/**
-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic
-	 * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
 	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
 	 * @generated
@@ -63,24 +62,24 @@ public class OMADMSimulatorValidator extends EObjectValidator {
 	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.koneki.simulators.omadm.model";
 
 	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants. <!-- begin-user-doc --> <!--
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;
 
 	/**
-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class. <!-- begin-user-doc
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
 
 	/**
-	 * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public OMADMSimulatorValidator() {
@@ -88,43 +87,44 @@ public class OMADMSimulatorValidator extends EObjectValidator {
 	}
 
 	/**
-	 * Returns the package of this validator switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the package of this validator switch.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	protected EPackage getEPackage() {
-		return OMADMSimulatorPackage.eINSTANCE;
+	  return OMADMSimulatorPackage.eINSTANCE;
 	}
 
 	/**
-	 * Calls <code>validateXXX</code> for the corresponding classifier of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		switch (classifierID) {
-		case OMADMSimulatorPackage.OMADM_SIMULATION:
-			return validateOMADMSimulation((OMADMSimulation) value, diagnostics, context);
-		case OMADMSimulatorPackage.DEVICE:
-			return validateDevice((Device) value, diagnostics, context);
-		case OMADMSimulatorPackage.NODE:
-			return validateNode((Node) value, diagnostics, context);
-		case OMADMSimulatorPackage.DEVICE_ID_TYPE:
-			return validateDeviceIdType((DeviceIdType) value, diagnostics, context);
-		case OMADMSimulatorPackage.NODE_FORMAT:
-			return validateNodeFormat((NodeFormat) value, diagnostics, context);
-		case OMADMSimulatorPackage.COMMAND_MANAGEMENT:
-			return validateCommandManagement((CommandManagement) value, diagnostics, context);
-		default:
-			return true;
+			case OMADMSimulatorPackage.OMADM_SIMULATION:
+				return validateOMADMSimulation((OMADMSimulation)value, diagnostics, context);
+			case OMADMSimulatorPackage.DEVICE:
+				return validateDevice((Device)value, diagnostics, context);
+			case OMADMSimulatorPackage.NODE:
+				return validateNode((Node)value, diagnostics, context);
+			case OMADMSimulatorPackage.DEVICE_ID_TYPE:
+				return validateDeviceIdType((DeviceIdType)value, diagnostics, context);
+			case OMADMSimulatorPackage.NODE_FORMAT:
+				return validateNodeFormat((NodeFormat)value, diagnostics, context);
+			case OMADMSimulatorPackage.COMMAND_MANAGEMENT:
+				return validateCommandManagement((CommandManagement)value, diagnostics, context);
+			case OMADMSimulatorPackage.AUTHENTICATION_TYPE:
+				return validateAuthenticationType((AuthenticationType)value, diagnostics, context);
+			default:
+				return true;
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateOMADMSimulation(OMADMSimulation omadmSimulation, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -133,44 +133,111 @@ public class OMADMSimulatorValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateDevice(Device device, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(device, diagnostics, context))
-			return false;
+		if (!validate_NoCircularContainment(device, diagnostics, context)) return false;
 		boolean result = validate_EveryMultiplicityConforms(device, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(device, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(device, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(device, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(device, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(device, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(device, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(device, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDevice_deviceIdMustBeValid(device, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDevice_rootNodeCategoryMustBeValid(device, diagnostics, context);
-		/*
-		 * Add new tests validator
-		 */
-		if (result || diagnostics != null)
-			result &= validateDevice_serverURLMustBeValid(device, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDevice_loginMustBeValid(device, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDevice_passwordURLMustBeValid(device, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(device, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(device, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(device, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(device, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(device, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(device, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(device, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDevice_groupPathMustBeAValidPath(device, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDevice_modelNameMustBeValid(device, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDevice_customerPathMustBeAValidPath(device, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDevice_deviceIdMustBeValid(device, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDevice_rootNodeCategoryMustBeValid(device, diagnostics, context);
 		return result;
 	}
 
 	/**
+	 * Validates the groupPathMustBeAValidPath constraint of '<em>Device</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateDevice_groupPathMustBeAValidPath(Device device, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		// TODO implement the constraint
+		// -> specify the condition that violates the constraint
+		// -> verify the diagnostic details, including severity, code, and message
+		// Ensure that you remove @generated or mark it @generated NOT
+		if (false) {
+			if (diagnostics != null) {
+				diagnostics.add
+					(createDiagnostic
+						(Diagnostic.ERROR,
+						 DIAGNOSTIC_SOURCE,
+						 0,
+						 "_UI_GenericConstraint_diagnostic",
+						 new Object[] { "groupPathMustBeAValidPath", getObjectLabel(device, context) },
+						 new Object[] { device },
+						 context));
+			}
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Validates the modelNameMustBeValid constraint of '<em>Device</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateDevice_modelNameMustBeValid(Device device, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		// TODO implement the constraint
+		// -> specify the condition that violates the constraint
+		// -> verify the diagnostic details, including severity, code, and message
+		// Ensure that you remove @generated or mark it @generated NOT
+		if (false) {
+			if (diagnostics != null) {
+				diagnostics.add
+					(createDiagnostic
+						(Diagnostic.ERROR,
+						 DIAGNOSTIC_SOURCE,
+						 0,
+						 "_UI_GenericConstraint_diagnostic",
+						 new Object[] { "modelNameMustBeValid", getObjectLabel(device, context) },
+						 new Object[] { device },
+						 context));
+			}
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Validates the customerPathMustBeAValidPath constraint of '<em>Device</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateDevice_customerPathMustBeAValidPath(Device device, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		// TODO implement the constraint
+		// -> specify the condition that violates the constraint
+		// -> verify the diagnostic details, including severity, code, and message
+		// Ensure that you remove @generated or mark it @generated NOT
+		if (false) {
+			if (diagnostics != null) {
+				diagnostics.add
+					(createDiagnostic
+						(Diagnostic.ERROR,
+						 DIAGNOSTIC_SOURCE,
+						 0,
+						 "_UI_GenericConstraint_diagnostic",
+						 new Object[] { "customerPathMustBeAValidPath", getObjectLabel(device, context) },
+						 new Object[] { device },
+						 context));
+			}
+			return false;
+		}
+		return true;
+	}
+
+	/**
 	 * @param device
 	 * @param diagnostics
 	 * @param context
@@ -258,43 +325,26 @@ public class OMADMSimulatorValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateNode(Node node, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(node, diagnostics, context))
-			return false;
+		if (!validate_NoCircularContainment(node, diagnostics, context)) return false;
 		boolean result = validate_EveryMultiplicityConforms(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateNode_nodeNameMustBeValid(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateNode_nodeFormatMustBeValid(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateNode_nodeTypeMustBeValid(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateNode_nodeDataMustBeValid(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateNode_nodeManagementMustBeValid(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateNode_childrenMustBeAuthorized(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateNode_childrenCategoryMustBeValid(node, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateNode_childrenNameMustBeUnique(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validateNode_nodeNameMustBeValid(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validateNode_nodeFormatMustBeValid(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validateNode_nodeTypeMustBeValid(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validateNode_nodeDataMustBeValid(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validateNode_nodeManagementMustBeValid(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validateNode_childrenMustBeAuthorized(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validateNode_childrenCategoryMustBeValid(node, diagnostics, context);
+		if (result || diagnostics != null) result &= validateNode_childrenNameMustBeUnique(node, diagnostics, context);
 		return result;
 	}
 
@@ -454,7 +504,6 @@ public class OMADMSimulatorValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateDeviceIdType(DeviceIdType deviceIdType, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -463,7 +512,6 @@ public class OMADMSimulatorValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateNodeFormat(NodeFormat nodeFormat, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -472,7 +520,6 @@ public class OMADMSimulatorValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateCommandManagement(CommandManagement commandManagement, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -480,6 +527,15 @@ public class OMADMSimulatorValidator extends EObjectValidator {
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateAuthenticationType(AuthenticationType authenticationType, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return true;
+	}
+
+	/**
 	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
diff --git a/omadm/tests/org.eclipse.koneki.simulators.omadm.model.tests/src/org/eclipse/koneki/simulators/omadm/model/tests/DeviceTest.java b/omadm/tests/org.eclipse.koneki.simulators.omadm.model.tests/src/org/eclipse/koneki/simulators/omadm/model/tests/DeviceTest.java
index 2afb260..49a9150 100644
--- a/omadm/tests/org.eclipse.koneki.simulators.omadm.model.tests/src/org/eclipse/koneki/simulators/omadm/model/tests/DeviceTest.java
+++ b/omadm/tests/org.eclipse.koneki.simulators.omadm.model.tests/src/org/eclipse/koneki/simulators/omadm/model/tests/DeviceTest.java
@@ -25,13 +25,12 @@ import org.eclipse.koneki.simulators.omadm.model.util.NodeHelpers;
  * <p>
  * The following features are tested:
  * <ul>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Device#getDeviceId() <em>Device Id</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Device#getLogin() <em>Login</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Device#getPassword() <em>Password</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Device#getServerUrl() <em>Server Url</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Device#getDeviceId() <em>Device Id</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Device#getLogin() <em>Login</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Device#getPassword() <em>Password</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Device#getServerUrl() <em>Server Url</em>}</li>
  * </ul>
  * </p>
- * 
  * @generated
  */
 public class DeviceTest extends TestCase {
@@ -81,15 +80,14 @@ public class DeviceTest extends TestCase {
 	}
 
 	/**
-	 * The fixture for this Device test case. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The fixture for this Device test case.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected Device fixture = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static void main(String[] args) {
@@ -97,8 +95,8 @@ public class DeviceTest extends TestCase {
 	}
 
 	/**
-	 * Constructs a new Device test case with the given name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Constructs a new Device test case with the given name.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public DeviceTest(String name) {
@@ -106,8 +104,8 @@ public class DeviceTest extends TestCase {
 	}
 
 	/**
-	 * Sets the fixture for this Device test case. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Sets the fixture for this Device test case.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected void setFixture(Device fixture) {
@@ -115,8 +113,8 @@ public class DeviceTest extends TestCase {
 	}
 
 	/**
-	 * Returns the fixture for this Device test case. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the fixture for this Device test case.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected Device getFixture() {
@@ -125,7 +123,6 @@ public class DeviceTest extends TestCase {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see junit.framework.TestCase#setUp()
 	 * @generated
 	 */
@@ -136,7 +133,6 @@ public class DeviceTest extends TestCase {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see junit.framework.TestCase#tearDown()
 	 * @generated
 	 */
diff --git a/omadm/tests/org.eclipse.koneki.simulators.omadm.model.tests/src/org/eclipse/koneki/simulators/omadm/model/tests/NodeTest.java b/omadm/tests/org.eclipse.koneki.simulators.omadm.model.tests/src/org/eclipse/koneki/simulators/omadm/model/tests/NodeTest.java
index cb91401..a85780c 100644
--- a/omadm/tests/org.eclipse.koneki.simulators.omadm.model.tests/src/org/eclipse/koneki/simulators/omadm/model/tests/NodeTest.java
+++ b/omadm/tests/org.eclipse.koneki.simulators.omadm.model.tests/src/org/eclipse/koneki/simulators/omadm/model/tests/NodeTest.java
@@ -28,26 +28,25 @@ import org.eclipse.koneki.simulators.omadm.model.util.NodeHelpers;
  * <p>
  * The following operations are tested:
  * <ul>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getPath() <em>Get Path</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRoot() <em>Get Root</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealGetManagement() <em>Get Real Get Management</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealAddManagement() <em>Get Real Add Management</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealDeleteManagement() <em>Get Real Delete Management</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealCopyManagement() <em>Get Real Copy Management</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealReplaceManagement() <em>Get Real Replace Management</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealExecManagement() <em>Get Real Exec Management</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealGetCode() <em>Get Real Get Code</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealAddCode() <em>Get Real Add Code</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealDeleteCode() <em>Get Real Delete Code</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealCopyCode() <em>Get Real Copy Code</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealReplaceCode() <em>Get Real Replace Code</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealExecCode() <em>Get Real Exec Code</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#isRoot() <em>Is Root</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#isInterior() <em>Is Interior</em>}</li>
- * <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#isLeaf() <em>Is Leaf</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getPath() <em>Get Path</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRoot() <em>Get Root</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealGetManagement() <em>Get Real Get Management</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealAddManagement() <em>Get Real Add Management</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealDeleteManagement() <em>Get Real Delete Management</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealCopyManagement() <em>Get Real Copy Management</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealReplaceManagement() <em>Get Real Replace Management</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealExecManagement() <em>Get Real Exec Management</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealGetCode() <em>Get Real Get Code</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealAddCode() <em>Get Real Add Code</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealDeleteCode() <em>Get Real Delete Code</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealCopyCode() <em>Get Real Copy Code</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealReplaceCode() <em>Get Real Replace Code</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#getRealExecCode() <em>Get Real Exec Code</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#isRoot() <em>Is Root</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#isInterior() <em>Is Interior</em>}</li>
+ *   <li>{@link org.eclipse.koneki.simulators.omadm.model.Node#isLeaf() <em>Is Leaf</em>}</li>
  * </ul>
  * </p>
- * 
  * @generated
  */
 public class NodeTest extends TestCase {
@@ -61,15 +60,14 @@ public class NodeTest extends TestCase {
 	}
 
 	/**
-	 * The fixture for this Node test case. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The fixture for this Node test case.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected Node fixture = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static void main(String[] args) {
@@ -77,8 +75,8 @@ public class NodeTest extends TestCase {
 	}
 
 	/**
-	 * Constructs a new Node test case with the given name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Constructs a new Node test case with the given name.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public NodeTest(String name) {
@@ -86,8 +84,8 @@ public class NodeTest extends TestCase {
 	}
 
 	/**
-	 * Sets the fixture for this Node test case. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Sets the fixture for this Node test case.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected void setFixture(Node fixture) {
@@ -95,8 +93,8 @@ public class NodeTest extends TestCase {
 	}
 
 	/**
-	 * Returns the fixture for this Node test case. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the fixture for this Node test case.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected Node getFixture() {
@@ -105,7 +103,6 @@ public class NodeTest extends TestCase {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see junit.framework.TestCase#setUp()
 	 * @generated
 	 */
@@ -116,7 +113,6 @@ public class NodeTest extends TestCase {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see junit.framework.TestCase#tearDown()
 	 * @generated
 	 */
diff --git a/omadm/tests/org.eclipse.koneki.simulators.omadm.model.tests/src/org/eclipse/koneki/simulators/omadm/model/tests/OMADMSimulationTest.java b/omadm/tests/org.eclipse.koneki.simulators.omadm.model.tests/src/org/eclipse/koneki/simulators/omadm/model/tests/OMADMSimulationTest.java
new file mode 100644
index 0000000..98ad0c0
--- a/dev/null
+++ b/omadm/tests/org.eclipse.koneki.simulators.omadm.model.tests/src/org/eclipse/koneki/simulators/omadm/model/tests/OMADMSimulationTest.java
@@ -0,0 +1,93 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.koneki.simulators.omadm.model.tests;
+
+import junit.framework.TestCase;
+
+import junit.textui.TestRunner;
+
+import org.eclipse.koneki.simulators.omadm.model.OMADMSimulation;
+import org.eclipse.koneki.simulators.omadm.model.OMADMSimulatorFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * A test case for the model object '<em><b>OMADM Simulation</b></em>'.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class OMADMSimulationTest extends TestCase {
+
+	/**
+	 * The fixture for this OMADM Simulation test case.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected OMADMSimulation fixture = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static void main(String[] args) {
+		TestRunner.run(OMADMSimulationTest.class);
+	}
+
+	/**
+	 * Constructs a new OMADM Simulation test case with the given name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OMADMSimulationTest(String name) {
+		super(name);
+	}
+
+	/**
+	 * Sets the fixture for this OMADM Simulation test case.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void setFixture(OMADMSimulation fixture) {
+		this.fixture = fixture;
+	}
+
+	/**
+	 * Returns the fixture for this OMADM Simulation test case.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected OMADMSimulation getFixture() {
+		return fixture;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see junit.framework.TestCase#setUp()
+	 * @generated
+	 */
+	@Override
+	protected void setUp() throws Exception {
+		setFixture(OMADMSimulatorFactory.eINSTANCE.createOMADMSimulation());
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see junit.framework.TestCase#tearDown()
+	 * @generated
+	 */
+	@Override
+	protected void tearDown() throws Exception {
+		setFixture(null);
+	}
+
+} //OMADMSimulationTest