Update with patched utils