Add rest of CLI options.