Change endpoint handling