Adding search ability