Updated CLIServer