added endpoint manager