More improvements to parse