Update to use util instead of sys