More control endpoint handling