Remove explicit opts argument, add engine.opts