Fix heartbeat notification.
Delegates default handler instantiation to the ObjectFactory