Updates to Parser