Added support for link hints