Fixes
Refactor to CPO