Refactored importer, added setup