diff --git a/scm-clients/scm-client-api/src/main/java/sonia/scm/client/RepositoryClientHandler.java b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/RepositoryClientHandler.java
new file mode 100644
index 0000000000..f88be8136e
--- /dev/null
+++ b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/RepositoryClientHandler.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.client;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import sonia.scm.Type;
+import sonia.scm.repository.Repository;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.Collection;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public interface RepositoryClientHandler extends ClientHandler<Repository>
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public Collection<Type> getRepositoryTypes();
+}
diff --git a/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientSession.java b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientSession.java
index c0193c4d0f..3a63e0c092 100644
--- a/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientSession.java
+++ b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientSession.java
@@ -37,7 +37,6 @@ package sonia.scm.client;
 
 import sonia.scm.ScmState;
 import sonia.scm.group.Group;
-import sonia.scm.repository.Repository;
 import sonia.scm.user.User;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -65,7 +64,7 @@ public interface ScmClientSession extends Closeable
    *
    * @return
    */
-  public ClientHandler<Repository> getRepositoryHandler();
+  public RepositoryClientHandler getRepositoryHandler();
 
   /**
    * Method description
diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientSession.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientSession.java
index 6d035c9a61..b27a7180a3 100644
--- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientSession.java
+++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientSession.java
@@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory;
 
 import sonia.scm.ScmState;
 import sonia.scm.group.Group;
-import sonia.scm.repository.Repository;
 import sonia.scm.user.User;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -129,7 +128,7 @@ public class JerseyClientSession implements ScmClientSession
    * @return
    */
   @Override
-  public ClientHandler<Repository> getRepositoryHandler()
+  public RepositoryClientHandler getRepositoryHandler()
   {
     return new JerseyRepositoryClientHandler(this);
   }
diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyRepositoryClientHandler.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyRepositoryClientHandler.java
index 78a876dbb2..61e162502b 100644
--- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyRepositoryClientHandler.java
+++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyRepositoryClientHandler.java
@@ -35,6 +35,7 @@ package sonia.scm.client;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import sonia.scm.Type;
 import sonia.scm.repository.Repository;
 import sonia.scm.util.AssertUtil;
 
@@ -45,13 +46,14 @@ import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.GenericType;
 import com.sun.jersey.api.client.WebResource;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
  *
  * @author Sebastian Sdorra
  */
-public class JerseyRepositoryClientHandler implements ClientHandler<Repository>
+public class JerseyRepositoryClientHandler implements RepositoryClientHandler
 {
 
   /**
@@ -62,6 +64,7 @@ public class JerseyRepositoryClientHandler implements ClientHandler<Repository>
    */
   public JerseyRepositoryClientHandler(JerseyClientSession session)
   {
+    this.session = session;
     this.client = session.getClient();
     this.urlProvider = session.getUrlProvider();
   }
@@ -241,6 +244,18 @@ public class JerseyRepositoryClientHandler implements ClientHandler<Repository>
     return repositories;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  public Collection<Type> getRepositoryTypes()
+  {
+    return session.getState().getRepositoryTypes();
+  }
+
   /**
    * Method description
    *
@@ -282,6 +297,9 @@ public class JerseyRepositoryClientHandler implements ClientHandler<Repository>
   /** Field description */
   private Client client;
 
+  /** Field description */
+  private JerseyClientSession session;
+
   /** Field description */
   private ScmUrlProvider urlProvider;
 }