Refactored importers to reduce duplication.