PhraseConceptPair and other major changes