Add message field support