Complete heartbeat support