Add search_file and search_dir