XML Rework - 2