xml parsing updates

xml parsing updates