Add multi-char message types and MessageWrapper generator