Update CpkEndpoints for 5.0