Updated Util class.