Updated xml structure