Merge Dim's lexicon changes