Add fields token to messages