Adding search capability