Added output_file option