Update to support multiple servers