Updated util class.