Changed structure with the Util class.