Improvements to lexicon header