Added search and count classes