added ClientEndpoint