added support for address and link