Added support for links