Major refactoring for Utils 2.0
Bumping revision to 1.2