Less coupling between ServerHook and Endpoint