Refactoring after Utils 2.0.