Added Lexicomp support