diff --git a/src/EventDispatcher/EventDispatcherInterface.php b/src/EventDispatcher/EventDispatcherInterface.php
index ff78838..65daf4d 100644
--- a/src/EventDispatcher/EventDispatcherInterface.php
+++ b/src/EventDispatcher/EventDispatcherInterface.php
@@ -8,14 +8,9 @@
 interface EventDispatcherInterface
 {
     /**
-     * @param $eventName
+     * Dispatches an event
+     * @param string $eventName The name of the event
      * @param array ...$arguments
      */
     public function dispatch($eventName, ...$arguments);
-
-    /**
-     * @param string $eventName
-     * @param callable $callable
-     */
-    public function addListener($eventName, callable $callable);
-}
\ No newline at end of file
+}
diff --git a/src/EventDispatcher/EventListenerInterface.php b/src/EventDispatcher/EventListenerInterface.php
new file mode 100644
index 0000000..1c19b81
--- /dev/null
+++ b/src/EventDispatcher/EventListenerInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace HelloFresh\Engine\EventDispatcher;
+
+/**
+ * Base type for an event listener.
+ */
+interface EventListenerInterface
+{
+    /**
+     * Adds a listener to an event
+     * @param string $eventName The event name
+     * @param callable $callable The callable that will be called when the event happens
+     */
+    public function addListener($eventName, callable $callable);
+}
\ No newline at end of file
diff --git a/src/EventDispatcher/EventDispatcher.php b/src/EventDispatcher/InMemoryDispatcher.php
similarity index 88%
rename from src/EventDispatcher/EventDispatcher.php
rename to src/EventDispatcher/InMemoryDispatcher.php
index 9841058..9e70b87 100644
--- a/src/EventDispatcher/EventDispatcher.php
+++ b/src/EventDispatcher/InMemoryDispatcher.php
@@ -7,9 +7,9 @@
 use Collections\MapInterface;
 
 /**
- * Event dispatcher implementation.
+ * In Memory Event dispatcher implementation.
  */
-class EventDispatcher implements EventDispatcherInterface
+class InMemoryDispatcher implements EventDispatcherInterface, EventListenerInterface
 {
     /**
      * @var MapInterface