Optimized imports, refactored