refactored import list logic