Added Endpoint extension facility