Added support for both formats via knife cli options.