Add lexicon support