Changes to parsing