refactored import_helper