Added -output-format option to the cli