Updates to parser