Updated XMLFormat