add class search with perfection