Refactor importer for netex