Update with CM changes