XML format changes