Various changes/adjustments to properly support CP including error handling mechanism