Updated CP to use common-help