Update to use library for finding remote servers