Increasing the Effectiveness and Flexibility of CPD