Updated to generic MessageUtil