Adding links support