Updates to parsing