Updates to parsing for Goo 1.0