Added CPD extractor