Adds support for search