Improvements on linking