integrate heartbeat support