refactor to multi end point address