added endpoint support