Added support for output-level command option