Xml Rework - 1