Changed xml format