More intelligent linking