- added support for all kinds of links.