Added search for classes options