diff --git a/org.fortiss.tooling.kernel/model/.ratings b/org.fortiss.tooling.kernel/model/.ratings
index 00eed0bdb279b4dd693b26718a0a478609614cc8..835db1e56cd9cb18ebdaa0c94580fe24c9e0bc0a 100644
--- a/org.fortiss.tooling.kernel/model/.ratings
+++ b/org.fortiss.tooling.kernel/model/.ratings
@@ -1 +1 @@
-kernel.ecore 2fc8ecb347d3ca168852534d911c52ceb5492117 RED
+kernel.ecore 4a3d1961b1e127d034898770d2899ac722d690a7 RED
diff --git a/org.fortiss.tooling.kernel/model/kernel.ecore b/org.fortiss.tooling.kernel/model/kernel.ecore
index 2fc8ecb347d3ca168852534d911c52ceb5492117..4a3d1961b1e127d034898770d2899ac722d690a7 100644
--- a/org.fortiss.tooling.kernel/model/kernel.ecore
+++ b/org.fortiss.tooling.kernel/model/kernel.ecore
@@ -123,7 +123,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="ISpeciallyCopyiable" abstract="true"
       interface="true">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Interface to hook code to handle special cases for copy and paste."/>
+      <details key="documentation" value="Interface to hook code to handle special cases for copy and paste.&#xD;&#xA;TODO: For pending improvements, see #2343."/>
     </eAnnotations>
     <eOperations name="specialCopyHook">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -146,24 +146,47 @@
   </eClassifiers>
   <eSubpackages name="constraints" nsURI="http://www.fortiss.org/tooling/base/model/element/constraints"
       nsPrefix="org-fortiss-tooling-kernel-constraints">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="TODO: Consolidate with constraint metaclasses in tooling.base."/>
+    </eAnnotations>
     <eClassifiers xsi:type="ecore:EClass" name="IConstrained" abstract="true" interface="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Element which can be constrained. Keeps track of all the constraints which apply to it."/>
       </eAnnotations>
       <eStructuralFeatures xsi:type="ecore:EReference" name="constraintInstances"
-          upperBound="-1" eType="#//constraints/ConstraintInstance"/>
+          upperBound="-1" eType="#//constraints/ConstraintInstance">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="TODO: write documentation (in the model!)"/>
+        </eAnnotations>
+      </eStructuralFeatures>
       <eStructuralFeatures xsi:type="ecore:EReference" name="checksumsPerConstraintName"
-          upperBound="-1" eType="#//constraints/ConstraintNameToChecksum" containment="true"/>
+          upperBound="-1" eType="#//constraints/ConstraintNameToChecksum" containment="true">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="TODO: write documentation (in the model!)"/>
+        </eAnnotations>
+      </eStructuralFeatures>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="ConstraintInstance">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Constraint &quot;instance&quot;: link between the constrained element(s) and the constraint. Explicitly represented in the model in order to store the status and the checksum(s) of the constrained element(s)"/>
       </eAnnotations>
       <eStructuralFeatures xsi:type="ecore:EReference" name="constraineds" upperBound="-1"
-          eType="#//constraints/IConstrained"/>
+          eType="#//constraints/IConstrained">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="TODO: write documentation (in the model!)"/>
+        </eAnnotations>
+      </eStructuralFeatures>
       <eStructuralFeatures xsi:type="ecore:EReference" name="status" eType="#//constraints/IConstraintInstanceStatus"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="constraintName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+          containment="true">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="TODO: write documentation (in the model!)"/>
+        </eAnnotations>
+      </eStructuralFeatures>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="constraintName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="TODO: write documentation (in the model!)"/>
+        </eAnnotations>
+      </eStructuralFeatures>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="IConstraintInstanceStatus" abstract="true"
         interface="true">
@@ -173,6 +196,7 @@
       <eOperations name="getConstraint" eType="#//constraints/ConstraintInstance">
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
           <details key="body" value="return (ConstraintInstance)this.eContainer();"/>
+          <details key="documentation" value="TODO: write documentation (in the model!)"/>
         </eAnnotations>
       </eOperations>
     </eClassifiers>
@@ -203,14 +227,26 @@
         <details key="documentation" value="Container to group multiple constraint instances."/>
       </eAnnotations>
       <eStructuralFeatures xsi:type="ecore:EReference" name="constraintInstances"
-          upperBound="-1" eType="#//constraints/ConstraintInstance" containment="true"/>
+          upperBound="-1" eType="#//constraints/ConstraintInstance" containment="true">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="TODO: write documentation (in the model!)"/>
+        </eAnnotations>
+      </eStructuralFeatures>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="ConstraintNameToChecksum" instanceClassName="java.util.Map$Entry">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Map type to map constraint names to checksum values."/>
       </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="TODO: write documentation (in the model!)"/>
+        </eAnnotations>
+      </eStructuralFeatures>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="TODO: write documentation (in the model!)"/>
+        </eAnnotations>
+      </eStructuralFeatures>
     </eClassifiers>
   </eSubpackages>
 </ecore:EPackage>