Added cpd check