Update to work with latest CM