Optimized imports in agent