Make message generation friendly