Refactored: import