HeartbeatDaemon refactored