Conform with new Lexicon rulez