Refactored XML response
working on J3.2