ENHANCE: Added linking through a table generator