added support for link and link target