Updates to XML Parser