Refactored XML