Changes for xml parsing