CPassive updates and simplifications