Make end point fully configurable