Changed XML formating