Update to use CFD/CPD and tagged words.