added links support