Added heartbeat system