Moved ResolvedOp to invoker