Simplify endpoints logic and enable last endpoints