Added some more fields to Link struct