Added code for option to set the CLI from the command line