diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java
index 9e1d71d71aae5087a1b6141062c380bb2abfb6ec..1b3b3cd7285d7b9047cf817efd9fb8857b7d0b83 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/CommandStackService.java
@@ -32,7 +32,7 @@ import org.fortiss.tooling.kernel.utils.LoggingUtils;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: 6ED785C2A4A796956D1766963F540C74
+ * @ConQAT.Rating YELLOW Hash: BA190E69F3975AEA8C17310496C653BE
  */
 public class CommandStackService implements ICommandStackService {
 	/** {@inheritDoc} */
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PersistencyService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PersistencyService.java
index 9a5fd1cb1540146d8ecb794508490a181b793fa3..3c449da7123de85f5d04efd6291be0247b1c3ca6 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PersistencyService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PersistencyService.java
@@ -49,7 +49,7 @@ import org.osgi.framework.Bundle;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 5BEC676F284500DFF68D2C56ADA1C3D0
+ * @ConQAT.Rating YELLOW Hash: 060A162FF7D175A41E24EA12218D968F
  */
 public class PersistencyService implements IPersistencyService {
 
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PrototypeService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PrototypeService.java
index c9a346cabef290643cc018c84144c48f75bbc4fb..dae4faa79b2ec538537b68c4d8e045173f680acd 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PrototypeService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/PrototypeService.java
@@ -40,7 +40,7 @@ import org.osgi.framework.Bundle;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: 86C5C8E593C55BD338124CCDC30AF856
+ * @ConQAT.Rating GREEN Hash: 3A9E0E7507FDAA18F3DF5658815983F7
  */
 public class PrototypeService implements IPrototypeService {
 
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EMFTransactionalCommand.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EMFTransactionalCommand.java
index 32671194dff255d24007b97efc68e1b90c0d056e..b22f372c01a8f6dd08b63117cca5e120ba87c662 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EMFTransactionalCommand.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EMFTransactionalCommand.java
@@ -38,7 +38,7 @@ import org.fortiss.tooling.kernel.utils.LoggingUtils;
  * @author hummel
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 6AF9B849FA94FE28EEAE8F998B9511F0
+ * @ConQAT.Rating YELLOW Hash: 27D92C7B38D1ECDF229AAE5E7CFA8C94
  */
 public class EMFTransactionalCommand implements Command {
 
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageProvider.java
index 9829afcde1f574079d9a64c53adb99744e72cdf7..e775619042e19ca6cc31e40b1ea47e216d4154e0 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageProvider.java
@@ -56,7 +56,7 @@ import org.osgi.framework.Bundle;
  * @author hoelzlf
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: 937C16FE047D3D6450FA133EDFCD95D1
+ * @ConQAT.Rating GREEN Hash: 381A7724942C4F7BE3BFFCC64F1A7C91
  */
 public class EclipseResourceStorageProvider implements
 		IEclipseResourceStorageService, IResourceChangeListener,
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java
index 2b974c998518891874e42feae94b750ac6ca7ba8..4e4431c2f9be3f15a295f760f82cda08cd354c36 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java
@@ -52,7 +52,7 @@ import org.fortiss.tooling.kernel.utils.LoggingUtils;
  * @author hummel
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: CD42B63C274F623DE3D9BAFA6CFB5846
+ * @ConQAT.Rating YELLOW Hash: 9B3C3C5DF436704CB38392ECEC8E5E64
  */
 class ModelContext implements ITopLevelElement {
 
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAware2ServiceBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAware2ServiceBase.java
index 5382789dca1b2101ba8dbec676ffe6948178d111..b9adcf845d2731a7aa0483aa16e2a48eb2f313c8 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAware2ServiceBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAware2ServiceBase.java
@@ -26,7 +26,6 @@ import org.conqat.lib.commons.reflect.ReflectionUtils;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.fortiss.tooling.kernel.ToolingKernelActivator;
 import org.fortiss.tooling.kernel.internal.ConnectionCompositorService;
-import org.fortiss.tooling.kernel.internal.ElementCompositorService;
 import org.fortiss.tooling.kernel.utils.ExtensionPointUtils;
 import org.fortiss.tooling.kernel.utils.LoggingUtils;
 import org.osgi.framework.Bundle;
@@ -58,17 +57,14 @@ import org.osgi.framework.Bundle;
  * is <code>false</code>.
  * </UL>
  * 
- * TODO: {@link ElementCompositorService} or {@link ConnectionCompositorService}
- * ?
- * 
  * An example implementation of a service based on this class is given by
- * {@link ElementCompositorService}. The corresponding extension point schema is
- * defined in <code>schema/modelElementConnectionCompositor.exsd</code>.
+ * {@link ConnectionCompositorService}. The corresponding extension point schema
+ * is defined in <code>schema/modelElementConnectionCompositor.exsd</code>.
  * 
  * @author hoelzlf
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: A84331A14E4EF55D9FD9FB282DA918B2
+ * @ConQAT.Rating YELLOW Hash: 471CFA38BD6D8FD59075D9178B0533CB
  */
 public abstract class ObjectAware2ServiceBase<T extends IObjectAware2<? extends Object, ? extends Object>> {
 
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
index 84e43a1c5836b362c719bf4c7bb2e3658e952aef..c150beefdfe1dad32faeea94e14b65c4476bb16d 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/base/ObjectAwareServiceBase.java
@@ -63,7 +63,7 @@ import org.osgi.framework.Bundle;
  * @author hoelzlf
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 93375807324DBDF3639FA5D77D1E61BE
+ * @ConQAT.Rating YELLOW Hash: D19FC62CA8B9952F92B0FEFAE4099132
  */
 public abstract class ObjectAwareServiceBase<T extends IObjectAware<? extends Object>> {