Add namespace support to link catalogs