improve xml importer