Increased flexibility when handling endpoints that require different hosts