Updated xml format