Full refactoring of utilities.