Changes in XML generation