Add tokenized field so we can store the raw input too.