Add heartbeat support