More XML changes