Update for cmp changes