Updates to parser engine