diff --git a/lib/tfw/components/directory_monitoring_event_handler.py b/lib/tfw/components/directory_monitoring_event_handler.py
index c9c39bc..d34cf00 100644
--- a/lib/tfw/components/directory_monitoring_event_handler.py
+++ b/lib/tfw/components/directory_monitoring_event_handler.py
@@ -44,7 +44,7 @@ class DirectoryMonitoringEventHandler(TriggerlessEventHandler):
         self._monitor = DirectoryMonitor(self._directory)
         self._monitor.watch()   # This runs on a separate thread
 
-    def handle_event(self, key, message):
+    def handle_event(self, message):
         try:
             message['data'] = self.commands[message['data']['command']](message['data'])
             return message
diff --git a/lib/tfw/components/process_managing_event_handler.py b/lib/tfw/components/process_managing_event_handler.py
index f069c67..3f6c24a 100644
--- a/lib/tfw/components/process_managing_event_handler.py
+++ b/lib/tfw/components/process_managing_event_handler.py
@@ -30,7 +30,7 @@ class ProcessManagingEventHandler(TriggerlessEventHandler):
         self.processmanager = ProcessManager()
 
     @with_monitor_paused
-    def handle_event(self, key, message):
+    def handle_event(self, message):
         try:
             data = message['data']
             self.processmanager(data['command'], data['process_name'])
diff --git a/lib/tfw/components/terminado_event_handler.py b/lib/tfw/components/terminado_event_handler.py
index 58ccd4b..65ab905 100644
--- a/lib/tfw/components/terminado_event_handler.py
+++ b/lib/tfw/components/terminado_event_handler.py
@@ -27,7 +27,7 @@ class TerminadoEventHandler(TriggerlessEventHandler):
     def historymonitor(self):
         return self._historymonitor
 
-    def handle_event(self, key, message):
+    def handle_event(self, message):
         LOG.debug('TerminadoEventHandler received event: %s', message)
         try:
             message['data'] = self.commands[message['data']['command']](message['data'])
diff --git a/lib/tfw/components/webide_event_handler.py b/lib/tfw/components/webide_event_handler.py
index 8c032d2..0a303ed 100644
--- a/lib/tfw/components/webide_event_handler.py
+++ b/lib/tfw/components/webide_event_handler.py
@@ -171,7 +171,7 @@ class WebideEventHandler(TriggerlessEventHandler):
         data['files'] = self.filemanager.files
         data['directory'] = self.filemanager.workdir
 
-    def handle_event(self, key, message):
+    def handle_event(self, message):
         try:
             data = message['data']
             message['data'] = self.commands[data['command']](data)
diff --git a/lib/tfw/event_handler_base.py b/lib/tfw/event_handler_base.py
index ab455b0..f9b4a09 100644
--- a/lib/tfw/event_handler_base.py
+++ b/lib/tfw/event_handler_base.py
@@ -19,25 +19,25 @@ class EventHandlerBase(ABC):
     def event_handler_callback(self, msg_parts):
         message = deserialize_tfw_msg(*msg_parts)
         key = message['key']
-        response = self.dispatch_handling(key, message)
+        response = self.dispatch_handling(message)
         response['key'] = key
         if response is None:
             return
         self.server_connector.send(response)
 
     @abstractmethod
-    def dispatch_handling(self, key, message):
+    def dispatch_handling(self, message):
         raise NotImplementedError
 
-    def _dispatch_handling(self, key, message):
+    def _dispatch_handling(self, message):
         # pylint: disable=no-else-return
-        if key != 'reset':
-            return self.handle_event(key, message)
+        if message['key'] != 'reset':
+            return self.handle_event(message)
         else:
             return self.handle_reset(message)
 
     @abstractmethod
-    def handle_event(self, key, message):
+    def handle_event(self, message):
         raise NotImplementedError
 
     def handle_reset(self, message):
@@ -67,8 +67,8 @@ class EventHandlerBase(ABC):
 
 class TriggerlessEventHandler(EventHandlerBase, ABC):
     # pylint: disable=abstract-method
-    def dispatch_handling(self, key, message):
-        return self._dispatch_handling(key, message)
+    def dispatch_handling(self, message):
+        return self._dispatch_handling(message)
 
 
 class TriggeredEventHandler(EventHandlerBase, ABC):
@@ -77,7 +77,7 @@ class TriggeredEventHandler(EventHandlerBase, ABC):
         super().__init__(key)
         self.trigger = trigger
 
-    def dispatch_handling(self, key, message):
+    def dispatch_handling(self, message):
         if message.get('trigger') == self.trigger:
-            return self._dispatch_handling(key, message)
+            return self._dispatch_handling(message)
         return None