Utilities refactor