Add --output-format command line option