Updates to speedup hart management