XML improvement