Improve addChannelLinks