Changed xml structure.