Updated to support multiple host endpoints