Added a few additional CLI options.