diff --git a/bmc_state_manager.hpp b/bmc_state_manager.hpp
index ee97070..239ad10 100644
--- a/bmc_state_manager.hpp
+++ b/bmc_state_manager.hpp
@@ -34,7 +34,7 @@
      * @param[in] objPath   - The Dbus object path
      */
     BMC(sdbusplus::bus::bus& bus, const char* objPath) :
-        BMCInherit(bus, objPath, true), bus(bus),
+        BMCInherit(bus, objPath, BMCInherit::action::defer_emit), bus(bus),
         stateSignal(std::make_unique<decltype(stateSignal)::element_type>(
             bus,
             sdbusRule::type::signal() + sdbusRule::member("JobRemoved") +
diff --git a/chassis_state_manager.hpp b/chassis_state_manager.hpp
index 1dc7716..3bd44cd 100644
--- a/chassis_state_manager.hpp
+++ b/chassis_state_manager.hpp
@@ -47,7 +47,8 @@
      * @param[in] id        - Chassis id
      */
     Chassis(sdbusplus::bus::bus& bus, const char* objPath, size_t id) :
-        ChassisInherit(bus, objPath, true), bus(bus),
+        ChassisInherit(bus, objPath, ChassisInherit::action::defer_emit),
+        bus(bus),
         systemdSignals(
             bus,
             sdbusRule::type::signal() + sdbusRule::member("JobRemoved") +
diff --git a/host_state_manager.hpp b/host_state_manager.hpp
index 1e9bb10..6b9d687 100644
--- a/host_state_manager.hpp
+++ b/host_state_manager.hpp
@@ -54,7 +54,7 @@
      * @param[in] id        - The Host id
      */
     Host(sdbusplus::bus::bus& bus, const char* objPath, size_t id) :
-        HostInherit(bus, objPath, true), bus(bus),
+        HostInherit(bus, objPath, HostInherit::action::defer_emit), bus(bus),
         systemdSignalJobRemoved(
             bus,
             sdbusRule::type::signal() + sdbusRule::member("JobRemoved") +
diff --git a/hypervisor_state_manager.hpp b/hypervisor_state_manager.hpp
index 9bb3cb2..929c1aa 100644
--- a/hypervisor_state_manager.hpp
+++ b/hypervisor_state_manager.hpp
@@ -41,7 +41,9 @@
      * @param[in] objPath   - The Dbus object path
      */
     Hypervisor(sdbusplus::bus::bus& bus, const char* objPath) :
-        HypervisorInherit(bus, objPath, false), bus(bus),
+        HypervisorInherit(bus, objPath,
+                          HypervisorInherit::action::emit_object_added),
+        bus(bus),
         bootProgressChangeSignal(
             bus,
             sdbusRule::propertiesChanged(
diff --git a/scheduled_host_transition.hpp b/scheduled_host_transition.hpp
index 3e24f89..4d917af 100644
--- a/scheduled_host_transition.hpp
+++ b/scheduled_host_transition.hpp
@@ -31,7 +31,8 @@
   public:
     ScheduledHostTransition(sdbusplus::bus::bus& bus, const char* objPath,
                             const sdeventplus::Event& event) :
-        ScheduledHostTransitionInherit(bus, objPath, true),
+        ScheduledHostTransitionInherit(
+            bus, objPath, ScheduledHostTransition::action::defer_emit),
         bus(bus), event(event),
         timer(event, std::bind(&ScheduledHostTransition::callback, this))
     {