Refactoring to ListSelection and PhraseCollection