Yeah, both things are in the pipeline to implement. The heartbeat is indeed a good way to handle it.