[#59970960] - refactoring the XML parser