Improve xml response parsing