Upgraded MSM vocabulary implementation according to the new vocabulary.