PlanOp improvements