Updated way XML is handled