Adding support for link resolving