Added lexicon structure and methods