Adapting to refactored Engine.