Adapt to new lexicon version