Updated with new search-related files and info