Major refactoring for Utils 2.0