Restored listeners for endpoint handling