Partially fixed the XML issue