Article importer refactor