Add search_files/vars