Updated to latest endpoint_base features