refactor mza importer