diff --git a/fw-update/firmware_inventory_manager.cpp b/fw-update/firmware_inventory_manager.cpp
new file mode 100644
index 0000000..4b09b4f
--- /dev/null
+++ b/fw-update/firmware_inventory_manager.cpp
@@ -0,0 +1,96 @@
+#include "firmware_inventory_manager.hpp"
+
+#include "common/types.hpp"
+#include "common/utils.hpp"
+
+#include <phosphor-logging/lg2.hpp>
+
+PHOSPHOR_LOG2_USING;
+
+namespace pldm::fw_update
+{
+
+void FirmwareInventoryManager::createFirmwareEntry(
+    const SoftwareIdentifier& softwareIdentifier,
+    const SoftwareName& softwareName, const std::string& activeVersion,
+    const Descriptors& descriptors, const ComponentInfo& componentInfo)
+{
+    struct timespec ts;
+    clock_gettime(CLOCK_REALTIME, &ts);
+    unsigned seed = ts.tv_nsec ^ getpid();
+    srandom(seed);
+
+    auto& eid = softwareIdentifier.first;
+    const auto inventoryPath = getInventoryPath(eid);
+    if (!inventoryPath)
+    {
+        error("No inventory path found for EID {EID}", "EID", eid);
+        return;
+    }
+    auto boardPath = getBoardPath(*dbusHandler, *inventoryPath);
+
+    if (!boardPath)
+    {
+        error("Failed to get board path for EID {EID}", "EID", eid);
+        return;
+    }
+    const auto boardName = boardPath->filename().string();
+    const auto softwarePath =
+        std::format("/xyz/openbmc_project/software/{}_{}_{}", boardName,
+                    softwareName, utils::generateSwId());
+
+    softwareMap.insert_or_assign(
+        softwareIdentifier, std::make_unique<FirmwareInventory>(
+                                softwareIdentifier, softwarePath, activeVersion,
+                                *boardPath, descriptors, componentInfo));
+}
+
+void FirmwareInventoryManager::deleteFirmwareEntry(const pldm::eid& eid)
+{
+    std::erase_if(softwareMap,
+                  [&](const auto& pair) { return pair.first.first == eid; });
+}
+
+std::optional<std::filesystem::path> getBoardPath(
+    const pldm::utils::DBusHandler& handler, const InventoryPath& path)
+{
+    constexpr auto boardInterface = "xyz.openbmc_project.Inventory.Item.Board";
+    pldm::utils::GetAncestorsResponse response;
+
+    try
+    {
+        response = handler.getAncestors(path.c_str(), {boardInterface});
+    }
+    catch (const sdbusplus::exception_t& e)
+    {
+        error("Failed to get ancestors for path {PATH}: {ERROR}", "PATH", path,
+              "ERROR", e);
+        return std::nullopt;
+    }
+
+    if (response.empty())
+    {
+        error(
+            "Failed to get unique board path for Inventory path {PATH}, found: {SIZE}",
+            "PATH", path, "SIZE", response.size());
+        return std::nullopt;
+    }
+
+    return std::get<ObjectPath>(response.front());
+}
+
+std::optional<InventoryPath> FirmwareInventoryManager::getInventoryPath(
+    const pldm::eid& eid) const
+{
+    for (const auto& [configDbusPath, configMctpInfo] : configurations)
+    {
+        if (std::get<pldm::eid>(configMctpInfo) == eid)
+        {
+            return configDbusPath;
+        }
+    }
+    warning("No inventory path found for EID {EID}", "EID", eid);
+    return std::nullopt;
+}
+
+} // namespace pldm::fw_update