Added some LINK fields and logic.