Revised XML structure