Rework link generation