Reworked how the XML data is parsed to add flexibility.