Add support for public links