Adding search capabilities