Update to reflect new utility module