Changes for producing xml file