Adding support for links