Added heartbeat and status