diff --git a/scm-core/src/main/java/sonia/scm/protocolcommand/CommandInterpreter.java b/scm-core/src/main/java/sonia/scm/protocolcommand/CommandInterpreter.java
index 1e04eb3b66..e78b2b011c 100644
--- a/scm-core/src/main/java/sonia/scm/protocolcommand/CommandInterpreter.java
+++ b/scm-core/src/main/java/sonia/scm/protocolcommand/CommandInterpreter.java
@@ -1,13 +1,8 @@
 package sonia.scm.protocolcommand;
 
-import sonia.scm.plugin.ExtensionPoint;
-
-@ExtensionPoint
 public interface CommandInterpreter {
 
-  boolean canHandle(String command);
-
-  CommandParser getParser();
+  String[] getParsedArgs();
 
   ScmCommandProtocol getProtocolHandler();
 }
diff --git a/scm-core/src/main/java/sonia/scm/protocolcommand/CommandInterpreterFactory.java b/scm-core/src/main/java/sonia/scm/protocolcommand/CommandInterpreterFactory.java
new file mode 100644
index 0000000000..9d6bfa1d7f
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/protocolcommand/CommandInterpreterFactory.java
@@ -0,0 +1,10 @@
+package sonia.scm.protocolcommand;
+
+import sonia.scm.plugin.ExtensionPoint;
+
+import java.util.Optional;
+
+@ExtensionPoint
+public interface CommandInterpreterFactory {
+  Optional<CommandInterpreter> canHandle(String command);
+}
diff --git a/scm-core/src/main/java/sonia/scm/protocolcommand/CommandParser.java b/scm-core/src/main/java/sonia/scm/protocolcommand/CommandParser.java
deleted file mode 100644
index 1d1f0c9b34..0000000000
--- a/scm-core/src/main/java/sonia/scm/protocolcommand/CommandParser.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package sonia.scm.protocolcommand;
-
-public interface CommandParser {
-
-  String[] parse(String command);
-
-}