Improved thread safety of Link