Added module lexing