Adding a standard set of CLI options