[PR] Add data fields for link and terms