Optimizer import fix