Added manual_dir_source param