Improve xml