Adding support for hub links