Refactored XML parsers