Add ability to extract links