initial work to add lexicon support