applying changes to xml parser too