Updated to allow for link generation