diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConstraintVerificationService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConstraintVerificationService.java
index c1bf8dd8e689ab95ebaf859f47b5f5f98fcab290..6ca8847544c0bac99cd5f6fe3d95558e5386d209 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConstraintVerificationService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConstraintVerificationService.java
@@ -5,8 +5,8 @@ import java.util.function.Consumer;
 
 import org.fortiss.tooling.kernel.extension.IConstraintVerifier;
 import org.fortiss.tooling.kernel.internal.ConstraintVerificationService;
+import org.fortiss.tooling.kernel.model.constraints.Constraint;
 import org.fortiss.tooling.kernel.model.constraints.IConstrained;
-import org.fortiss.tooling.kernel.model.constraints.IConstraint;
 import org.fortiss.tooling.kernel.model.constraints.IConstraintVerificationStatus;
 import org.fortiss.tooling.kernel.model.constraints.OutdatedVerificationStatus;
 
@@ -17,7 +17,7 @@ import org.fortiss.tooling.kernel.model.constraints.OutdatedVerificationStatus;
  * @author aravantinos
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: EA0300E3E7FE78E9541ADC365502975F
+ * @ConQAT.Rating YELLOW Hash: F5501E6C42356F1144C44D6ED201BF04
  */
 public interface IConstraintVerificationService {
 	/** Returns the service instance. */
@@ -31,7 +31,13 @@ public interface IConstraintVerificationService {
 	 *            command. Should not yield any "useless" change because verification should always
 	 *            update the constraint status and the checksums anyways.
 	 */
-	void verify(IConstraint constraint);
+	void verify(Constraint constraint);
+
+	/**
+	 * @param constraint
+	 *            Cancels the last verification of <code>constraint</code>.
+	 */
+	void cancel(Constraint constraint);
 
 	/**
 	 * @param constraint
@@ -43,14 +49,14 @@ public interface IConstraintVerificationService {
 	 *         {isUpToDate} *only if IConstraintVerificationUIService.getStatus does not provide the
 	 *         information you want*.
 	 */
-	boolean isUpToDate(IConstraint constraint);
+	boolean isUpToDate(Constraint constraint);
 
 	/**
 	 * @param constraint
 	 * @return A list of possible automatic fixes for <code>constraint</code>. A constraint should
 	 *         be candidate to fixing if it is anything but successful or outdated.
 	 */
-	<T extends IConstraint> List<IFix> fixes(T constraint);
+	List<IFix> fixes(Constraint constraint);
 
 	/** Interface for a "fix". */
 	public interface IFix {
@@ -105,9 +111,8 @@ public interface IConstraintVerificationService {
 	 *            Leaves the other elements as they are if they exist, fill them with
 	 *            <code>null</code> till <code>index</code> otherwise.
 	 */
-	void setConstrained(IConstraint constraint, IConstrained constrained, int index);
+	void setConstrained(Constraint constraint, IConstrained constrained, int index);
 
 	/** Registers the given verifier with the service. */
-	<T extends IConstraint> void registerConstraintVerifier(IConstraintVerifier<T> verifier,
-			Class<T> constraintElementClass);
+	void registerConstraintVerifier(IConstraintVerifier verifier);
 }