Heartbeat support added for failure prevention