Improve xml report