Adding support for search