Minor changes in XML tag and attributes