Added the search classes