More parsing updates