Simplify avatar lookup class