Added support for search files