diff --git a/org.fortiss.tooling.base/trunk/model/base.ecore b/org.fortiss.tooling.base/trunk/model/base.ecore
index b042fd6e098dd3ae6a2ae844ab0cb8c271e2456b..f0d1a75aeb0bfe99f0534ccc6b8ec12c70fa7145 100644
--- a/org.fortiss.tooling.base/trunk/model/base.ecore
+++ b/org.fortiss.tooling.base/trunk/model/base.ecore
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
-    nsURI="http://www.fortiss.org/tooling/base" nsPrefix="org-fortiss-tooling-base">
-  <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElement" abstract="true"
-      interface="true" eSuperTypes="#//IHierarchicElementContainer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="connections" upperBound="-1"
-        eType="#//IConnection" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="connectors" upperBound="-1"
-        eType="#//IConnector" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="specifications" upperBound="-1"
-        eType="#//IHierarchicElementSpecification" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedBy" upperBound="-1"
-        eType="#//IHierarchicElementReference" eOpposite="#//IHierarchicElementReference/reference"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElementContainer" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="containedElements" upperBound="-1"
-        eType="#//IHierarchicElement" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElementReference" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="#//IHierarchicElement"
-        eOpposite="#//IHierarchicElement/referencedBy"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElementSpecification" abstract="true"
-      interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IConnector" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="specifications" upperBound="-1"
-        eType="#//IConnectorSpecification" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" upperBound="-1"
-        eType="#//IConnection" eOpposite="#//IConnection/target"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" upperBound="-1"
-        eType="#//IConnection" eOpposite="#//IConnection/source"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedBy" upperBound="-1"
-        eType="#//IConnectorReference" eOpposite="#//IConnectorReference/reference"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IConnectorSpecification" abstract="true"
-      interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IConnectorReference" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="#//IConnector"
-        eOpposite="#//IConnector/referencedBy"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IConnection" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//IConnector"
-        eOpposite="#//IConnector/outgoing"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//IConnector"
-        eOpposite="#//IConnector/incoming"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedBy" upperBound="-1"
-        eType="#//IConnectionReference" eOpposite="#//IConnectionReference/reference"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="specifications" upperBound="-1"
-        eType="#//IConnectionSpecification" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IConnectionReference" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" upperBound="-1"
-        eType="#//IConnection" eOpposite="#//IConnection/referencedBy"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IConnectionSpecification" abstract="true"
-      interface="true"/>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
+    nsURI="http://www.fortiss.org/tooling/base" nsPrefix="org-fortiss-tooling-base">
+  <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElement" abstract="true"
+      interface="true" eSuperTypes="#//IHierarchicElementContainer">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="connections" upperBound="-1"
+        eType="#//IConnection" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="connectors" upperBound="-1"
+        eType="#//IConnector" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="specifications" upperBound="-1"
+        eType="#//IHierarchicElementSpecification" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedBy" upperBound="-1"
+        eType="#//IHierarchicElementReference" eOpposite="#//IHierarchicElementReference/reference"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElementContainer" abstract="true"
+      interface="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="containedElements" upperBound="-1"
+        eType="#//IHierarchicElement" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElementReference" abstract="true"
+      interface="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="#//IHierarchicElement"
+        eOpposite="#//IHierarchicElement/referencedBy"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElementSpecification" abstract="true"
+      interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="IConnector" abstract="true" interface="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="specifications" upperBound="-1"
+        eType="#//IConnectorSpecification" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" upperBound="-1"
+        eType="#//IConnection" eOpposite="#//IConnection/target"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" upperBound="-1"
+        eType="#//IConnection" eOpposite="#//IConnection/source"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedBy" upperBound="-1"
+        eType="#//IConnectorReference" eOpposite="#//IConnectorReference/reference"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IConnectorSpecification" abstract="true"
+      interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="IConnectorReference" abstract="true"
+      interface="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="#//IConnector"
+        eOpposite="#//IConnector/referencedBy"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IConnection" abstract="true" interface="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//IConnector"
+        eOpposite="#//IConnector/outgoing"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//IConnector"
+        eOpposite="#//IConnector/incoming"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedBy" upperBound="-1"
+        eType="#//IConnectionReference" eOpposite="#//IConnectionReference/reference"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="specifications" upperBound="-1"
+        eType="#//IConnectionSpecification" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IConnectionReference" abstract="true"
+      interface="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" upperBound="-1"
+        eType="#//IConnection" eOpposite="#//IConnection/referencedBy"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IConnectionSpecification" abstract="true"
+      interface="true"/>
+</ecore:EPackage>
diff --git a/org.fortiss.tooling.kernel/trunk/model/kernel.ecore b/org.fortiss.tooling.kernel/trunk/model/kernel.ecore
index a9b46cf303bec6a5985a2907e7a4eb9d51cf01a1..520d37b477ad583841483aabcaa13a63c2718fa5 100644
--- a/org.fortiss.tooling.kernel/trunk/model/kernel.ecore
+++ b/org.fortiss.tooling.kernel/trunk/model/kernel.ecore
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
-    nsURI="http://www.fortiss.org/tooling/kernel" nsPrefix="org-fortiss-tooling-kernel">
-  <eClassifiers xsi:type="ecore:EClass" name="INamedElement" abstract="true" interface="true"
-      eSuperTypes="#//IIdLabeled">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Model elements implementing this interface have a unique id and a name."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name attribute."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="INamedCommentedElement" abstract="true"
-      interface="true" eSuperTypes="#//INamedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Model elements implementing this interface have a unique id, a name and a comment."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="comment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The comment attribute."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IProjectRootElement" abstract="true"
-      interface="true" eSuperTypes="#//INamedCommentedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="IProjectRootElement is the super class of all root elements contained in emfStore projects."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IIdLabeled" abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Model elements implementing this interface have a unique identifier."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique integer id."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IRemovable" abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Model elements implementing this interface can provide a custom remove operatoin."/>
-    </eAnnotations>
-    <eOperations name="canRemove" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Returns whether the current model element can be removed."/>
-        <details key="body" value="return IRemovableStaticImpl.canRemove(this);"/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="remove" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Removes the current model element from its parent."/>
-        <details key="body" value="return IRemovableStaticImpl.remove(this);"/>
-      </eAnnotations>
-    </eOperations>
-  </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
+    nsURI="http://www.fortiss.org/tooling/kernel" nsPrefix="org-fortiss-tooling-kernel">
+  <eClassifiers xsi:type="ecore:EClass" name="INamedElement" abstract="true" interface="true"
+      eSuperTypes="#//IIdLabeled">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Model elements implementing this interface have a unique id and a name."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The name attribute."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="INamedCommentedElement" abstract="true"
+      interface="true" eSuperTypes="#//INamedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Model elements implementing this interface have a unique id, a name and a comment."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="comment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The comment attribute."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IProjectRootElement" abstract="true"
+      interface="true" eSuperTypes="#//INamedCommentedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="IProjectRootElement is the super class of all root elements contained in emfStore projects."/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IIdLabeled" abstract="true" interface="true">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Model elements implementing this interface have a unique identifier."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The unique integer id."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IRemovable" abstract="true" interface="true">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Model elements implementing this interface can provide a custom remove operatoin."/>
+    </eAnnotations>
+    <eOperations name="canRemove" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Returns whether the current model element can be removed."/>
+        <details key="body" value="return IRemovableStaticImpl.canRemove(this);"/>
+      </eAnnotations>
+    </eOperations>
+    <eOperations name="remove" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Removes the current model element from its parent."/>
+        <details key="body" value="return IRemovableStaticImpl.remove(this);"/>
+      </eAnnotations>
+    </eOperations>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel b/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel
index 0404bf71fae962e62f538755b2b14dab54754240..069aabd62a17adf758c7f586c906afe08cb76658 100644
--- a/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel
+++ b/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel
@@ -21,5 +21,9 @@
     <genClasses image="false" ecoreClass="kernel.ecore#//IIdLabeled">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//IIdLabeled/id"/>
     </genClasses>
+    <genClasses image="false" ecoreClass="kernel.ecore#//IRemovable">
+      <genOperations ecoreOperation="kernel.ecore#//IRemovable/canRemove"/>
+      <genOperations ecoreOperation="kernel.ecore#//IRemovable/remove"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>