Modify xml parsing