Added conditionals to lexer