Updates to parser and scanner