Update xml format and handle transits.