Updated cmp workflow