Add spans
Use spans in lexer