diff --git a/libpldmresponder/base.hpp b/libpldmresponder/base.hpp
index 9a13f2d..2f7c714 100644
--- a/libpldmresponder/base.hpp
+++ b/libpldmresponder/base.hpp
@@ -13,7 +13,6 @@
 
 #include <vector>
 
-using namespace pldm::dbus_api;
 using namespace pldm::responder;
 
 namespace pldm
@@ -25,11 +24,12 @@
 class Handler : public CmdHandler
 {
   public:
-    Handler(uint8_t eid, Requester& requester, sdeventplus::Event& event,
+    Handler(uint8_t eid, pldm::InstanceIdDb& instanceIdDb,
+            sdeventplus::Event& event,
             pldm::responder::oem_platform::Handler* oemPlatformHandler,
             pldm::requester::Handler<pldm::requester::Request>* handler) :
         eid(eid),
-        requester(requester), event(event),
+        instanceIdDb(instanceIdDb), event(event),
         oemPlatformHandler(oemPlatformHandler), handler(handler)
     {
         handlers.emplace(PLDM_GET_PLDM_TYPES,
@@ -94,10 +94,8 @@
     /** @brief MCTP EID of host firmware */
     uint8_t eid;
 
-    /** @brief reference to Requester object, primarily used to access API to
-     *  obtain PLDM instance id.
-     */
-    Requester& requester;
+    /** @brief An instance ID database for allocating instance IDs. */
+    InstanceIdDb& instanceIdDb;
 
     /** @brief reference of main event loop of pldmd, primarily used to schedule
      *  work