Updated utility class