Update with util functions