Updated structure of Utils