diff --git a/lib/tfw/components/directory_monitor.py b/lib/tfw/components/directory_monitor.py
index 9726eb9..630ee07 100644
--- a/lib/tfw/components/directory_monitor.py
+++ b/lib/tfw/components/directory_monitor.py
@@ -70,8 +70,8 @@ class WebideReloadWatchdogEventHandler(FileSystemWatchdogEventHandler):
             self.ignore = self.ignore - 1
             return
         LOG.debug(event)
-        key = 'webide'
-        self.uplink.send(key, {'data': {'command': 'reload'}})
+        self.uplink.send({'key': 'webide',
+                          'data': {'command': 'reload'}})
 
 
 def with_monitor_paused(fun):
diff --git a/lib/tfw/event_handler_base.py b/lib/tfw/event_handler_base.py
index fdce167..479379d 100644
--- a/lib/tfw/event_handler_base.py
+++ b/lib/tfw/event_handler_base.py
@@ -19,9 +19,10 @@ class EventHandlerBase(ABC):
     def event_handler_callback(self, msg_parts):
         key, message = deserialize_all(*msg_parts)
         response = self.dispatch_handling(key, message)
+        response['key'] = key
         if response is None:
             return
-        self.server_connector.send(key, response)
+        self.server_connector.send(response)
 
     @abstractmethod
     def dispatch_handling(self, key, message):
diff --git a/lib/tfw/networking/event_handlers/server_connector.py b/lib/tfw/networking/event_handlers/server_connector.py
index 4479e75..74c2316 100644
--- a/lib/tfw/networking/event_handlers/server_connector.py
+++ b/lib/tfw/networking/event_handlers/server_connector.py
@@ -29,13 +29,13 @@ class ServerUplinkConnector(ZMQConnectorBase):
         self._zmq_push_socket = self._zmq_context.socket(zmq.PUSH)
         self._zmq_push_socket.connect('tcp://localhost:{}'.format(TFWENV.RECEIVER_PORT))
 
-    def send_to_eventhandler(self, key, message):
-        message['data']['key'] = key
-        self.send('mirror', message)
+    def send_to_eventhandler(self, message):
+        message['data']['key'] = message['key']
+        message['key'] = 'mirror'
+        self.send(message)
 
-    def send(self, key, message):
-        message['key'] = key
-        self._zmq_push_socket.send_multipart(serialize_all(key, message))
+    def send(self, message):
+        self._zmq_push_socket.send_multipart(serialize_all(message['key'], message))
 
 
 class ServerConnector(ServerUplinkConnector, ServerDownlinkConnector):
diff --git a/lib/tfw/networking/message_sender.py b/lib/tfw/networking/message_sender.py
index ba08daf..5e73b08 100644
--- a/lib/tfw/networking/message_sender.py
+++ b/lib/tfw/networking/message_sender.py
@@ -17,5 +17,5 @@ class MessageSender:
             'timestamp': datetime.now().isoformat(),
             'message': message
         }
-        response = {'data': data}
-        self.server_connector.send(self.key, response)
+        self.server_connector.send({'key': self.key,
+                                    'data': data})
diff --git a/lib/tfw/networking/server/tfw_server.py b/lib/tfw/networking/server/tfw_server.py
index 63ddf72..b9766ae 100644
--- a/lib/tfw/networking/server/tfw_server.py
+++ b/lib/tfw/networking/server/tfw_server.py
@@ -100,12 +100,11 @@ class FSMUpdater:
 
     def update(self, kwargs_dict):
         # pylint: disable=unused-argument
-        self.uplink.send(*self.generate_fsm_update())
+        self.uplink.send(self.generate_fsm_update())
 
     def generate_fsm_update(self):
-        key = 'FSMUpdate'
-        response = {'data': self.get_fsm_state_and_transitions()}
-        return key, response
+        return {'key': 'FSMUpdate',
+                'data': self.get_fsm_state_and_transitions()}
 
     def get_fsm_state_and_transitions(self):
         state = self.fsm.state