Add CPD back (without line number support for now)