Import refactored