Updated CLIServerCommands