Modifications to XmlToTable class