Major refactorings in utilities