Changed Utils structure