Added support for search