Adding search capability and to_s output