Update to latest cpa spec