diff --git a/app/src/gen3/talent.py b/app/src/gen3/talent.py
index 0081742..a0af3cd 100644
--- a/app/src/gen3/talent.py
+++ b/app/src/gen3/talent.py
@@ -205,16 +205,6 @@ class Talent(Message):
         self.ifc.tx_log(log_lvl, f'Send Modbus {state}:{self.addr}:')
         self.ifc.tx_flush()
 
-    def _send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
-        if self.state != State.up:
-            logger.log(log_lvl, f'[{self.node_id}] ignore MODBUS cmd,'
-                       ' as the state is not UP')
-            return
-        self.mb.build_msg(Modbus.INV_ADDR, func, addr, val, log_lvl)
-
-    async def send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
-        self._send_modbus_cmd(func, addr, val, log_lvl)
-
     def mb_timout_cb(self, exp_cnt):
         self.mb_timer.start(self.mb_timeout)
 
diff --git a/app/src/gen3plus/solarman_v5.py b/app/src/gen3plus/solarman_v5.py
index 889ef15..bae555c 100644
--- a/app/src/gen3plus/solarman_v5.py
+++ b/app/src/gen3plus/solarman_v5.py
@@ -435,16 +435,6 @@ class SolarmanV5(Message):
         self.ifc.tx_log(log_lvl, f'Send Modbus {state}:{self.addr}:')
         self.ifc.tx_flush()
 
-    def _send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
-        if self.state != State.up:
-            logger.log(log_lvl, f'[{self.node_id}] ignore MODBUS cmd,'
-                       ' as the state is not UP')
-            return
-        self.mb.build_msg(Modbus.INV_ADDR, func, addr, val, log_lvl)
-
-    async def send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
-        self._send_modbus_cmd(func, addr, val, log_lvl)
-
     def mb_timout_cb(self, exp_cnt):
         self.mb_timer.start(self.mb_timeout)
 
diff --git a/app/src/messages.py b/app/src/messages.py
index bbff315..ccb8f3d 100644
--- a/app/src/messages.py
+++ b/app/src/messages.py
@@ -152,6 +152,16 @@ class Message(ProtocolIfc):
             to = self.MAX_DEF_IDLE_TIME
         return to
 
+    def _send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
+        if self.state != State.up:
+            logger.log(log_lvl, f'[{self.node_id}] ignore MODBUS cmd,'
+                       ' as the state is not UP')
+            return
+        self.mb.build_msg(Modbus.INV_ADDR, func, addr, val, log_lvl)
+
+    async def send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
+        self._send_modbus_cmd(func, addr, val, log_lvl)
+
     '''
     Our puplic methods
     '''