Add --format option to more subcommands