diff --git a/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClient.java b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClient.java
index 0ec776d5f4..8fd24be788 100644
--- a/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClient.java
+++ b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClient.java
@@ -33,13 +33,22 @@
 
 package sonia.scm.client;
 
+//~--- non-JDK imports --------------------------------------------------------
+
+import sonia.scm.util.ServiceUtil;
+
 /**
  *
  * @author Sebastian Sdorra
  */
-public interface ScmClient
+public class ScmClient
 {
 
+  /** Field description */
+  private static volatile ScmClientProvider provider = null;
+
+  //~--- methods --------------------------------------------------------------
+
   /**
    * Creates an ScmClientSession for the given user
    *
@@ -52,9 +61,12 @@ public interface ScmClient
    *
    * @throws ScmClientException
    */
-  public ScmClientSession createSession(String url, String username,
+  public static ScmClientSession createSession(String url, String username,
           String password)
-          throws ScmClientException;
+          throws ScmClientException
+  {
+    return getProvider().createSession(url, username, password);
+  }
 
   /**
    * Creates an anonymous ScmClientSession
@@ -66,5 +78,33 @@ public interface ScmClient
    *
    * @throws ScmClientException
    */
-  public ScmClientSession createSession(String url) throws ScmClientException;
+  public static ScmClientSession createSession(String url)
+          throws ScmClientException
+  {
+    return getProvider().createSession(url, null, null);
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  private static ScmClientProvider getProvider()
+  {
+    if (provider == null)
+    {
+      synchronized (ScmClientProvider.class)
+      {
+        if (provider == null)
+        {
+          provider = ServiceUtil.getService(ScmClientProvider.class);
+        }
+      }
+    }
+
+    return provider;
+  }
 }
diff --git a/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientException.java b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientException.java
index a5522969a4..1e4036f22d 100644
--- a/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientException.java
+++ b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientException.java
@@ -1,10 +1,10 @@
 /**
  * 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,
@@ -13,7 +13,7 @@
  * 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
@@ -24,10 +24,13 @@
  * 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;
 
 /**
@@ -36,8 +39,44 @@ package sonia.scm.client;
  */
 public class ScmClientException extends Exception
 {
-  
-  
-  
-  
+
+  /**
+   * Constructs ...
+   *
+   */
+  public ScmClientException() {}
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param message
+   */
+  public ScmClientException(String message)
+  {
+    super(message);
+  }
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param cause
+   */
+  public ScmClientException(Throwable cause)
+  {
+    super(cause);
+  }
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param message
+   * @param cause
+   */
+  public ScmClientException(String message, Throwable cause)
+  {
+    super(message, cause);
+  }
 }
diff --git a/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientProvider.java b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientProvider.java
new file mode 100644
index 0000000000..aed69a372e
--- /dev/null
+++ b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientProvider.java
@@ -0,0 +1,58 @@
+/**
+ * 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;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public interface ScmClientProvider
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @param url
+   * @param username
+   * @param password
+   *
+   * @return
+   *
+   * @throws ScmClientException
+   */
+  public ScmClientSession createSession(String url, String username,
+          String password)
+          throws ScmClientException;
+}