Added linktastic support for linking