Added parsing updates for XML