Improve linking performance