diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectDiagramController.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectDiagramController.java
index 2b253941592ee25ead95223470f983f23ef9776f..019e37a9016e895a720374f31667972744080e3b 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectDiagramController.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectDiagramController.java
@@ -26,7 +26,7 @@ import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 import org.fortiss.tooling.common.ui.javafx.lwfxef.DiagramCoordinate;
 import org.fortiss.tooling.common.ui.javafx.lwfxef.DiagramViewerFeatures;
-import org.fortiss.tooling.common.ui.javafx.lwfxef.controller.base.ControllerBase;
+import org.fortiss.tooling.common.ui.javafx.lwfxef.controller.base.DefaultDiagramController;
 import org.fortiss.tooling.common.ui.javafx.lwfxef.model.IModelChangeProvider;
 import org.fortiss.tooling.common.ui.javafx.lwfxef.mvc.IMVCBundle;
 import org.fortiss.tooling.kernel.extension.data.IElementCompositionContext;
@@ -43,7 +43,7 @@ import javafx.scene.input.Dragboard;
  * 
  * @author hoelzl
  */
-public class EObjectDiagramController<T extends EObject> extends ControllerBase {
+public class EObjectDiagramController<T extends EObject> extends DefaultDiagramController {
 	/** The model change provider. */
 	private final EObjectModelChangeProvider modelChangeProvider;
 
diff --git a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
index 49df815773ee153a788a178f4da28e5ae92df30a..0fc6e843d2e13fc7d07c0729486854291bb77859 100644
--- a/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
+++ b/org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/lwfxef/controller/base/.ratings
@@ -1,7 +1,7 @@
 AnchorageContentControllerBase.java da56b10cbf2711b5da69f0b59f43eacbe54f4eea GREEN
 ClickControllerBase.java 8e5861ed5f9318008ad0fdd5497ed320cd5bd647 GREEN
 ContentAnchorageMoveControllerBase.java c18e7915ce23e124757f5b736086ecc46694800a GREEN
-ControllerBase.java 0d262e742f492c6821cd00675dc33dec14855181 YELLOW
+ControllerBase.java 63cf61e3c32a346d442b79898f6f813b4c9d4dce YELLOW
 DefaultDiagramController.java 0e083b89a08f63967102a384d66ebc1d64d203af GREEN
 DelegatingContentAnchorageController.java 2e3b1b4e14402a3503233f816b21ef3e4aa09edc GREEN
 DragControllerBase.java b15ff874304f679fe494d85f57cc8cbe4d0d1d15 GREEN