Added support for the Lex parser