First heartbeat support for #9