Additions to parser