Add support for cpx_endpoint