Adding "links" support