Perf Improvement in AvidRegister