Updated utility class.