Added output_dir