Updates to parsers