Doesn’t support adding the server, but adds improved support for handling picking server location, node, and ip+port