Adding support for searching