diff --git a/scm-core/src/main/java/sonia/scm/Manager.java b/scm-core/src/main/java/sonia/scm/Manager.java
index d5600842c9..53659ab0cc 100644
--- a/scm-core/src/main/java/sonia/scm/Manager.java
+++ b/scm-core/src/main/java/sonia/scm/Manager.java
@@ -48,6 +48,17 @@ public interface Manager<T extends TypedObject, E extends Exception>
         extends HandlerBase<T, E>
 {
 
+  /**
+   * Method description
+   *
+   *
+   * @param type
+   * @param <H>
+   *
+   * @return
+   */
+  public <H extends Handler<T, E>> H getHandler(String type);
+
   /**
    * Method description
    *
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
index bdeb068ce2..799b4a894b 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryManager.java
@@ -55,5 +55,6 @@ public interface RepositoryManager
    *
    * @return
    */
+  @Override
   public RepositoryHandler getHandler(String type);
 }