Perf improvements for AvidRegister