add proper cpd mapping