Simplify class search