Make CPS/NCMP upgradeable