Enhancements required for new messages.