Added search as a feature