diff --git a/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/service/base/.ratings b/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/service/base/.ratings
index 544c5caf5868e8322df00d6790cec6560fe3a4cb..31cbdb4a7e17914130b3956c8be73838554f274e 100644
--- a/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/service/base/.ratings
+++ b/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/service/base/.ratings
@@ -5,4 +5,4 @@ IEObjectAware2.java 1e34fc55934f0c1e7ac55a7e5dba5b52db72f1c9 GREEN
 IObjectAware.java 0027a3854c54e6197c9ba022625b38851db8f6bd GREEN
 IObjectAware2.java ec03db09b2162e30df788abdd11557c6f4adeaf9 GREEN
 ObjectAware2ServiceBase.java 1583f2e3f72ca2f01343a218dce2ed97e7db4c57 GREEN
-ObjectAwareServiceBase.java 4be963c95a5a69db95fc68f306f3a5b2e3f3c0a1 GREEN
+ObjectAwareServiceBase.java 1d5665c36339e1b16b50d32959cade48935f53b4 YELLOW
diff --git a/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java b/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
index 4be963c95a5a69db95fc68f306f3a5b2e3f3c0a1..1d5665c36339e1b16b50d32959cade48935f53b4 100644
--- a/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
+++ b/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
@@ -83,10 +83,11 @@ public abstract class ObjectAwareServiceBase<T extends IObjectAware<? extends Ob
 	/**
 	 * Returns the list of registered handlers for the given class.
 	 * 
-	 * IMPORTANT: this method only returns the first registered handler which is found. A different
-	 * implementation where all registered handlers are returned can be found in
-	 * org.fortiss.tooling.base.annotation.AnnotationValueService#getRegisteredHandlers.
-	 * If this behavior will be reused we should change this method. (Refs 2270)
+	 * IMPORTANT: this method only returns the handlers that are registered for the provided
+	 * {@code modelElementClass}. In case also the handlers registered for the super-types of the
+	 * this class should be retrieved, the implementation
+	 * {@code org.fortiss.tooling.base.annotation.AnnotationValueService#getRegisteredHandlers}
+	 * should be generalized and made available here (#2270)
 	 */
 	public List<T> getRegisteredHandlers(Class<?> modelElementClass) {
 		return performNearestClassLookup(modelElementClass, handlerMap);