diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings
index 547ce3bf33cb708e602c3a1612709427f6086e95..2a3b09de1862679da992af51ac18642ffd2acd72 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings
@@ -1,10 +1,10 @@
 ContextMenuUtil.java 7be87ce47b775d90c533078e22d4d445d9864caf GREEN
-EObjectDiagramController.java bd4a68e86f7941c04ef0f0d664c2848e7063126c YELLOW
+EObjectDiagramController.java 61d3c8fddbdc7b128e6c2bea657f3effd3d78edc RED
 EObjectModelChangeProvider.java f4b60cebb088a5c81ca92a41614e1a5d40030502 GREEN
-EObjectRectangularResizableContentControllerBase.java b2a2751705ad0832117b8926d88826846d46b82e YELLOW
+EObjectRectangularResizableContentControllerBase.java b2a2751705ad0832117b8926d88826846d46b82e GREEN
 KernelServiceBasedModelChangeProviderBase.java 18e48f17ea8dfba90de024a8959fc5a4b0d05d45 GREEN
-LayoutModelChangeProvider.java d6ad0b5af2cd324ff77e4a214db302a1ef3d6a57 YELLOW
-LayoutedContentAnchorageController.java 70e5960964ba505f28df6df8db52f2d17231b223 YELLOW
-LayoutedDiagramAnchorageController.java 898ad367bea8889c26e5bbfa050048382cb0b7f0 YELLOW
-LayoutedLinkBendPointController.java 475af314d4f4524ebdefb64e1914d1dfd471df85 YELLOW
-LayoutedRectangularResizableContentController.java aebb2c0de11e90d16f40bcbf346112a9d792bdf9 YELLOW
+LayoutModelChangeProvider.java b5449d02eaf39086909720c43e21bd061005fc9e GREEN
+LayoutedContentAnchorageController.java 70e5960964ba505f28df6df8db52f2d17231b223 GREEN
+LayoutedDiagramAnchorageController.java 898ad367bea8889c26e5bbfa050048382cb0b7f0 GREEN
+LayoutedLinkBendPointController.java 475af314d4f4524ebdefb64e1914d1dfd471df85 GREEN
+LayoutedRectangularResizableContentController.java aebb2c0de11e90d16f40bcbf346112a9d792bdf9 GREEN
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 bd4a68e86f7941c04ef0f0d664c2848e7063126c..61d3c8fddbdc7b128e6c2bea657f3effd3d78edc 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
@@ -47,6 +47,9 @@ public class EObjectDiagramController<T extends EObject> extends ControllerBase
 	/** Constructor. */
 	public EObjectDiagramController(IMVCBundle mvcb, Class<T> modelType) {
 		super(mvcb);
+		// TODO (TM): Replace lines 51-54 with
+		// Object model = requireNonNull(mvcb.getModel(), "The given model is null!")
+		// Should be applied in other classes as well.
 		Object model = mvcb.getModel();
 		if(model == null) {
 			throw new IllegalArgumentException("The given model is null!");
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutModelChangeProvider.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutModelChangeProvider.java
index d6ad0b5af2cd324ff77e4a214db302a1ef3d6a57..b5449d02eaf39086909720c43e21bd061005fc9e 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutModelChangeProvider.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/LayoutModelChangeProvider.java
@@ -26,7 +26,7 @@ import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
 import org.fortiss.tooling.base.model.layout.LayoutPackage;
 
 /**
- * An {@link KernelServiceBasedModelChangeProviderBase} for {@link ILayoutedModelElement}s.
+ * A {@link KernelServiceBasedModelChangeProviderBase} for {@link ILayoutedModelElement}s.
  * 
  * @author hoelzl
  */
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/factory/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/factory/.ratings
deleted file mode 100644
index 56ae5dd34bccbe6df2da5ee9e1e2131de552a5fa..0000000000000000000000000000000000000000
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/factory/.ratings
+++ /dev/null
@@ -1,4 +0,0 @@
-DelegatingControllerFactoryBase.java dea6b5dc56a157f0125bfe5c176e993d376b66b2 YELLOW
-DelegatingFactoryBase.java 37955dec868a0cb0e12986997c0078e0348e9e16 YELLOW
-DelegatingModelFactoryBase.java 413dcfad6542ffbc9a9504d08c17f6741ec3b01c YELLOW
-DelegatingVisualFactoryBase.java 4ec6971399df993b4cbd6d6ced6e801d914e1ae4 YELLOW
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/model/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/model/.ratings
index fd934e74b475c8c90384691caf94a67c7a3b3d1b..1f94f2987b843eba33765b057f6d210e4bbbcbb4 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/model/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/model/.ratings
@@ -1 +1 @@
-HierarchicElementModelFactoryBase.java 9996bfc1402c27424f0ae69e64560acce0ef81f4 YELLOW
+HierarchicElementModelFactoryBase.java 9996bfc1402c27424f0ae69e64560acce0ef81f4 GREEN
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/.ratings
index d3e23172e17bc8a3a3f8baf945e57f21619d3131..db2ee4b03726921fdd8d9a16d65dc6695e730178 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/.ratings
@@ -1,14 +1,9 @@
-CoordinateCorrections.java c5cc475b45de38c56fc2e888a2d3093cd2efb52a YELLOW
-LayoutedCircularAnchorageContentVisualBase.java 2aa292444671bf644e37bc923b877c92de0235b1 YELLOW
-LayoutedCircularAnchorageDiagramVisualBase.java f06e3b908020408e3cd268a3c63edcd75ef74f8b YELLOW
-LayoutedCircularContentAnchorageVisualBase.java 4c3ee2d3c00f3b04c0824330fa5c5aeaeb91da2f YELLOW
-LayoutedCircularDiagramAnchorageVisualBase.java dff18208ffd98682dca49c061361550d310bdf76 YELLOW
-LayoutedLineLinkVisual.java 634c6ceeab057afc5da0924f227375785836b179 YELLOW
-LayoutedRectangularContentVisualBase.java c2a3937b99284713e0bbcd3ce458874567b25ac5 YELLOW
-NamedLayoutedCircularAnchorageContentVisual.java c680002469ce897679fa5a3f4af51d1b19cb53d6 YELLOW
-NamedLayoutedCircularAnchorageDiagramVisual.java 714a176a0569a2049efb4009f710ca66bf3a57fb YELLOW
-NamedLayoutedConnectorContentVisual.java 087280aba1c523f5055bccad5cd4acde37abd7b9 YELLOW
-NamedLayoutedConnectorDiagramVisual.java 9fcf3825f7cfcdd5dafb58f9c53ad99fa9c0f381 YELLOW
-NamedLayoutedLineLinkVisual.java 72f577d9dc8748cbb488964633bb21ff88649aa1 YELLOW
-NamedLayoutedLinkVisual.java 92ce828c82e3a231b8f6e153d39bc77f396118fa YELLOW
-NamedLayoutedRectangularContentVisual.java 122e193ac587857d1dad23b42583a0bcf465f0d0 YELLOW
+CoordinateCorrections.java c5cc475b45de38c56fc2e888a2d3093cd2efb52a GREEN
+LayoutedCircularAnchorageContentVisualBase.java 2aa292444671bf644e37bc923b877c92de0235b1 GREEN
+LayoutedCircularAnchorageDiagramVisualBase.java f06e3b908020408e3cd268a3c63edcd75ef74f8b GREEN
+LayoutedLineLinkVisual.java 35740b4b5d08a6378086abf43682c66a8e471002 RED
+LayoutedRectangularContentVisualBase.java c2a3937b99284713e0bbcd3ce458874567b25ac5 GREEN
+NamedLayoutedCircularAnchorageContentVisual.java c680002469ce897679fa5a3f4af51d1b19cb53d6 GREEN
+NamedLayoutedCircularAnchorageDiagramVisual.java 714a176a0569a2049efb4009f710ca66bf3a57fb GREEN
+NamedLayoutedLineLinkVisual.java e66e5b2aaa40fe8b22a292e175bb8f3af4539b9d RED
+NamedLayoutedRectangularContentVisual.java 122e193ac587857d1dad23b42583a0bcf465f0d0 GREEN
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedLineLinkVisual.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedLineLinkVisual.java
index 634c6ceeab057afc5da0924f227375785836b179..35740b4b5d08a6378086abf43682c66a8e471002 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedLineLinkVisual.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedLineLinkVisual.java
@@ -37,6 +37,9 @@ import javafx.geometry.Rectangle2D;
  * 
  * @author munaro
  */
+// TODO (TM): As this class already requires the generic type to implement INamedElement
+// NamedLayoutedLineLinkVisual becomes useless. Remove INamedElement here and make class
+// abstract (consistent with the other Layouted*VisualBase classes)
 public class LayoutedLineLinkVisual<T extends ILayoutedModelElement & INamedElement>
 		extends LineLinkVisualBase {
 
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedLineLinkVisual.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedLineLinkVisual.java
index 72f577d9dc8748cbb488964633bb21ff88649aa1..e66e5b2aaa40fe8b22a292e175bb8f3af4539b9d 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedLineLinkVisual.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedLineLinkVisual.java
@@ -27,6 +27,7 @@ import org.fortiss.tooling.kernel.model.INamedElement;
  * 
  * @author diewald
  */
+// TODO (TM): See comment in LayoutedLineLinkVisual
 public class NamedLayoutedLineLinkVisual<T extends INamedElement & ILayoutedModelElement>
 		extends LayoutedLineLinkVisual<T> {
 
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/.ratings
index c38c6cd335b67c1468f0bf9d3a3c03d8e6ccf738..0f71fc3dd92acfc4197b5dc1400f09fe10e33967 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/.ratings
@@ -4,7 +4,7 @@ IContextMenuContributor.java 0f09c76662c154cf52ddab61b417e82a42854162 GREEN
 IContextMenuMultiSelectionContributor.java 125b31dd38009bc2095b7e6bc860e946e39f58c4 GREEN
 IEditPartFactory.java 5729715847f553d95a5bad4a9211c7e6f458badd GREEN
 IModelEditor.java 962d7f7758abc88bbc6064c8b4eb32da00abf8e8 GREEN
-IModelEditorBinding.java d6896569cfe7eb0d7f0b8e4a71573c50e8c75329 YELLOW
+IModelEditorBinding.java d6896569cfe7eb0d7f0b8e4a71573c50e8c75329 GREEN
 IModelElementHandler.java 21b4a96251e0267f156b4b8f2b95a97f6e81e646 GREEN
 ITutorialStepUI.java b8aee2b95857484ab6ad9ecd55b5de9f0ea158e5 GREEN
 ITutorialUIProvider.java aa0ff5db4d7ba0953e34edeb99f3e8279567e18f GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
index 4cc5494478a2322c4ade7175f87657c692b83500..066bc3695a9a3035d87c0017bc71dd5ab5ea35ef 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
@@ -7,8 +7,8 @@ EReferencePropertySectionBase.java 0548da6778516003257f59d0b4c2b60d458be3b6 GREE
 EditorBase.java 9c09fff92945256bb8680992ae7bb2c78f47b150 GREEN
 FXEditorBase.java 2e520be0bbae7d0aebdff70218a124dbe0896ce2 GREEN
 IListPropertySection.java 8bb00fe7959583e794ff9437b7a77404c9a9e70f GREEN
-LWFXEFEditorBase.java 121fd466f47bbfe0236834db1ad30efae6db219a YELLOW
-ModelEditorBindingBase.java c258cb0ea28d74440856cd2abf367408fbbc1279 YELLOW
+LWFXEFEditorBase.java 121fd466f47bbfe0236834db1ad30efae6db219a GREEN
+ModelEditorBindingBase.java c258cb0ea28d74440856cd2abf367408fbbc1279 GREEN
 ModelElementHandlerBase.java 384727748f125c9d43f19d9c0eba4ba1be5a7a26 GREEN
 MultiEObjectActionBase.java 9e237d8ea640c4194e4877af4a9cfce88698e543 GREEN
 NamedCommentedModelElementHandlerBase.java 681b98b50b362f01abb7a36f108f4f11b9e51829 GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/factory/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/factory/.ratings
index cdefb51652be0a3f0bab65ab20cb047d26514212..e394ca9914fdd47add342bb6abf34589f7b40d87 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/factory/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/factory/.ratings
@@ -1,4 +1,4 @@
-DelegatingControllerFactory.java ad214d83b5821b39862b7c382c91a13c3dfddbd0 YELLOW
-DelegatingFactoryBase.java f421742267610f41bb6196346026d2f239d90ed0 YELLOW
-DelegatingModelFactory.java 87ad29bc457b6316392625fb63221039bbb7c616 YELLOW
-DelegatingVisualFactory.java 7e834acd12ae4d1c2b2b32a5456dc9f2b6d4e466 YELLOW
+DelegatingControllerFactory.java ad214d83b5821b39862b7c382c91a13c3dfddbd0 GREEN
+DelegatingFactoryBase.java f421742267610f41bb6196346026d2f239d90ed0 GREEN
+DelegatingModelFactory.java 87ad29bc457b6316392625fb63221039bbb7c616 GREEN
+DelegatingVisualFactory.java 7e834acd12ae4d1c2b2b32a5456dc9f2b6d4e466 GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/.ratings
index dee095ff5337abc23e8481b3f05bf921d3126328..165b3770e4aa7fddfade7b35d2d4571da35d57a1 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/.ratings
@@ -5,7 +5,7 @@ ConstraintUIService.java 433e35bb1c9bbc628c6ee070ff45632400becf4a GREEN
 ContextMenuService.java ca3c899293f25b70ce8e5f0d86ca2f9683329d81 GREEN
 EditPartFactoryService.java e9180c0020f1769d9e24ef3c08f9ca5599dbc5c3 GREEN
 MarkerService.java b01b7706034691683df7bbc2e7828c42574b3147 GREEN
-ModelEditorBindingService.java 788b8b898c7ad4118321aefca47e7623eac2b3e2 YELLOW
+ModelEditorBindingService.java 788b8b898c7ad4118321aefca47e7623eac2b3e2 GREEN
 ModelElementHandlerService.java 07a30545ad687ff0fe13bf7a9348c41fb03e0b2c GREEN
 NavigatorService.java 2b1361eac805996e22e5409dafff9707fbac3376 GREEN
 ToolingKernelUIInternal.java 38903445a9084b7908716a00f41621dfb3126fca GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/editor/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/editor/.ratings
index c25fd1ce6f8ab3d3da2ec20465c9e302f84ad675..8f1ce218b8570f8aa5cf1c19a56bec8d65ab2e79 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/editor/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/editor/.ratings
@@ -1,5 +1,5 @@
 ActionBarContributor.java 18d9db3744c5381cca8b6823b5f7bc18183a1cfa GREEN
-ExtendableMultiPageEditor.java e06a7746f2bdcd2dfa279ae87e0578e0ee5046b2 YELLOW
+ExtendableMultiPageEditor.java e06a7746f2bdcd2dfa279ae87e0578e0ee5046b2 GREEN
 IActionContributingEditor.java 4aa7496d67822de919a8cf0af0ddaafc61bf2919 GREEN
 ModelElementEditorInput.java e269eff5d992d375a646e54d048f1f0efc6144dd GREEN
 TutorialStepUIEditor.java 9eadc96c302b5131ff4cc3715777718fa06ec7e8 GREEN
diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/service/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/service/.ratings
index 1b3ebff6c38c6084be80d55a07b6531abcb7766a..fd22b149f0941e9eed55e12988c6bc503e54c1e8 100644
--- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/service/.ratings
+++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/service/.ratings
@@ -4,7 +4,7 @@ IConstraintUIService.java 07df6b9553bf04f8c414c976dc630e6a1dd5ec96 GREEN
 IContextMenuService.java cfb6b8237b6cd2b0e461991a9ceb95969f330265 GREEN
 IEditPartFactoryService.java c448bff63fb81f57037c9f1dc5319859c12d0c4d GREEN
 IMarkerService.java d433e838e387dd2fe61b8dea7395ebb7203ae39b GREEN
-IModelEditorBindingService.java ce2ae1957e2232bb0fac1d1d262103f9adfc5266 YELLOW
+IModelEditorBindingService.java ce2ae1957e2232bb0fac1d1d262103f9adfc5266 GREEN
 IModelElementHandlerService.java c04c2876ccb8b3f8597c8e443f9c7c3db0945430 GREEN
 INavigatorService.java 8d2ffeb6f075d3abea904b84d8a40090d97837fd GREEN
 ITutorialUIService.java 72707c60c3d23d8ffc5c579cb9b022bb614eb094 GREEN