diff --git a/software_manager.cpp b/software_manager.cpp
index 15f7dbe..3ee9f1a 100644
--- a/software_manager.cpp
+++ b/software_manager.cpp
@@ -1,27 +1,24 @@
-#include "config.h"
+#include "item_updater.hpp"
 
 #include <phosphor-logging/lg2.hpp>
 #include <sdbusplus/async.hpp>
-#include <xyz/openbmc_project/Software/Update/server.hpp>
+
+using ItemUpdaterIntf = phosphor::software::updater::ItemUpdater;
 
 PHOSPHOR_LOG2_USING;
 
 int main()
 {
     info("Creating Software Manager");
-
     auto path = std::string(SOFTWARE_OBJPATH) + "/bmc";
     sdbusplus::async::context ctx;
-    sdbusplus::server::manager_t manager{ctx, path.c_str()};
+    sdbusplus::server::manager_t manager{ctx, SOFTWARE_OBJPATH};
 
-    // NOLINTNEXTLINE(readability-static-accessed-through-instance)
-    ctx.spawn([=](sdbusplus::async::context& ctx) -> sdbusplus::async::task<> {
-        constexpr auto serviceName = "xyz.openbmc_project.Software.Manager";
-        ctx.request_name(serviceName);
-        co_return;
-    }(ctx));
+    constexpr auto serviceName = "xyz.openbmc_project.Software.Manager";
+
+    ItemUpdaterIntf itemUpdater{ctx, path};
+    ctx.request_name(serviceName);
 
     ctx.run();
-
     return 0;
 }