Add working_dir to watchers