Added heartbeat support