diff --git a/mamba-core/src/main/java/mamba/mee/DefaultModelManager.java b/mamba-core/src/main/java/mamba/mee/DefaultModelManager.java
index 6f4621b94637b18a785cacada4db76b7fc93fa5f..b2311f93212966be48adc485bcd79f7b21a00700 100644
--- a/mamba-core/src/main/java/mamba/mee/DefaultModelManager.java
+++ b/mamba-core/src/main/java/mamba/mee/DefaultModelManager.java
@@ -19,18 +19,19 @@
 package mamba.mee;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
 
 /**
- *
+ * 
  * @author bes
  */
 public class DefaultModelManager extends AbstractModelManager {
-        
-    @Override
-    public Class<? extends EObject>[] getSupportedScopes() {
-        final Class<? extends EObject>[] result = new Class[1];
-		result[0] = EObject.class;
+
+	@Override
+	public Class<? extends EObject>[] getSupportedScopes() {
+		final Class<? extends EObject>[] result = new Class[1];
+		result[0] = EObjectImpl.class;
 		return result;
-    }
-    
+	}
+
 }
diff --git a/mamba-core/src/main/java/mamba/mee/MeasurementApplication.java b/mamba-core/src/main/java/mamba/mee/MeasurementApplication.java
index d5e01feb766055a325a02a2bc0f75d7064e4fcf3..ff0548f565375106a8c59052ee500b757b6911c6 100644
--- a/mamba-core/src/main/java/mamba/mee/MeasurementApplication.java
+++ b/mamba-core/src/main/java/mamba/mee/MeasurementApplication.java
@@ -49,15 +49,7 @@ public class MeasurementApplication {
 	 */
 	public static void main(final String[] args) {
 		try {
-			Thread.sleep(10000);
-		} catch (final InterruptedException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		System.out.println("start");
-		final long start = System.currentTimeMillis();
-		try {
-			if (args.length < 3) {
+			if (args.length < 4) {
 				System.out.println("You need at least 4 arguments:");
 				System.out.println("arg[0]: path to the smm instance");
 				System.out.println("arg[1]: comma separated list of requested "
@@ -99,7 +91,6 @@ public class MeasurementApplication {
 					props, requestedMeasures);
 			controller.execute();
 			controller.waitForCompletion();
-			System.out.println(System.currentTimeMillis() - start);
 		} catch (final Exception ex) {
 			_log.log(Level.SEVERE, "An error occured: " + ex.getMessage(), ex);
 			System.err.println("An error occured: " + ex.getMessage());