Added support for auto links