Major speed improvement for addChannelLinks