Update to latest CPA spec