#36 refactor xml importer