Added search for class