Add support for links