Add command line selection of server info