Changed to flat xml