Refactored imports for engine