diff --git a/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF b/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
index eb58feac2deae4889512cca38e6b56068de7100c..8e4f0c6e8663575f5db99b89681bdd35b746cdfe 100644
--- a/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.base.ui/trunk/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.fortiss.tooling.base.ui.ToolingBaseUIActivator
 Require-Bundle: org.fortiss.tooling.base;bundle-version="1.0.0";visibility:=reexport,
  org.fortiss.tooling.kernel.ui;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.jface.text;bundle-version="3.7.1"
+ org.eclipse.jface.text;bundle-version="3.7.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: fortiss
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TextEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TextEditorBase.java
index a769b82d922e4b811c29f98a18186d43037d0673..8f3df5280ad671b18be11e8ae86ef480c6810d63 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TextEditorBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TextEditorBase.java
@@ -26,7 +26,6 @@ import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.editors.text.TextEditor;
 import org.fortiss.tooling.kernel.service.ICommandStackService;
 import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
-import org.fortiss.tooling.kernel.ui.internal.editor.ModelElementEditorInput;
 
 /**
  * 
@@ -65,18 +64,20 @@ public class TextEditorBase<T extends EObject> extends TextEditor {
 	@Override
 	public void init(IEditorSite site, IEditorInput input)
 			throws PartInitException {
-		if (!(input instanceof ModelElementEditorInput)) {
-			throw new PartInitException("Expected input of type "
-					+ ModelElementEditorInput.class);
-		}
-		ModelElementEditorInput meInput = (ModelElementEditorInput) input;
-
-		editedObject = (T) meInput.getModelElement();
-		if (editedObject == null) {
-			throw new PartInitException("Missing model element!");
-		}
 
-		handler = (IModelElementHandler<T>) meInput.getModelElementHandler();
+		// if (!(input instanceof ModelElementEditorInput)) {
+		// throw new PartInitException("Expected input of type "
+		// + ModelElementEditorInput.class);
+		// }
+		// ModelElementEditorInput meInput = (ModelElementEditorInput) input;
+		//
+		// editedObject = (T) meInput.getModelElement();
+
+		// if (editedObject == null) {
+		// throw new PartInitException("Missing model element!");
+		// }
+		//
+		// handler = (IModelElementHandler<T>) meInput.getModelElementHandler();
 		if (handler == null) {
 			throw new PartInitException("Missing model element handler!");
 		}
diff --git a/org.fortiss.tooling.kernel.ui/trunk/META-INF/MANIFEST.MF b/org.fortiss.tooling.kernel.ui/trunk/META-INF/MANIFEST.MF
index 173442615fffb28e4291e92179e5d65280bbeb60..a047282c9da5b1cd31b7f10acaca1c226d3261bb 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.kernel.ui/trunk/META-INF/MANIFEST.MF
@@ -22,7 +22,6 @@ Export-Package: org.fortiss.tooling.kernel.ui,
  org.fortiss.tooling.kernel.ui.extension.base,
  org.fortiss.tooling.kernel.ui.extension.data,
  org.fortiss.tooling.kernel.ui.extension.editingsupport,
- org.fortiss.tooling.kernel.ui.internal.editor,
  org.fortiss.tooling.kernel.ui.listener,
  org.fortiss.tooling.kernel.ui.service,
  org.fortiss.tooling.kernel.ui.util