diff --git a/rtu/device_manager.hpp b/rtu/device_manager.hpp
index 68daa64..75fe75b 100644
--- a/rtu/device_manager.hpp
+++ b/rtu/device_manager.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "common/entity_manager_interface.hpp"
+#include "device/base_device.hpp"
 #include "inventory/modbus_inventory.hpp"
 #include "port/base_port.hpp"
 
@@ -11,6 +12,8 @@
 
 namespace InventoryIntf = phosphor::modbus::rtu::inventory;
 namespace PortIntf = phosphor::modbus::rtu::port;
+namespace ModbusIntf = phosphor::modbus::rtu;
+namespace DeviceIntf = phosphor::modbus::rtu::device;
 
 class DeviceManager
 {
@@ -26,13 +29,30 @@
   private:
     using inventory_device_map_t =
         std::unordered_map<std::string, std::unique_ptr<InventoryIntf::Device>>;
+
     using port_map_t =
         std::unordered_map<std::string, std::unique_ptr<PortIntf::BasePort>>;
 
+    using device_map_t =
+        std::unordered_map<std::string,
+                           std::unique_ptr<DeviceIntf::BaseDevice>>;
+
     auto processConfigAdded(const sdbusplus::message::object_path& objectPath,
                             const std::string& interfaceName)
         -> sdbusplus::async::task<>;
 
+    auto processPortAdded(const sdbusplus::message::object_path& objectPath,
+                          const std::string& interfaceName)
+        -> sdbusplus::async::task<>;
+
+    auto processInventoryAdded(
+        const sdbusplus::message::object_path& objectPath)
+        -> sdbusplus::async::task<>;
+
+    auto processDeviceAdded(const sdbusplus::message::object_path& objectPath,
+                            const std::string& interfaceName)
+        -> sdbusplus::async::task<>;
+
     auto processConfigRemoved(const sdbusplus::message::object_path& objectPath,
                               const std::string& interfaceName)
         -> sdbusplus::async::task<>;
@@ -41,6 +61,7 @@
     entity_manager::EntityManagerInterface entityManager;
     inventory_device_map_t inventoryDevices;
     port_map_t ports;
+    device_map_t devices; // Modbus devices
 };
 
 } // namespace phosphor::modbus::rtu