Refactored import.