Update to utils package refactor