Parsing improvements