Better XML structure.