add heartbeat support