Refactored imports