Added addLink support