Refactored XML response handling
Organization