Update to new interface of ops.