Added search capabilities