Massive upgrades for Utils