Improved link helper, but it is still far from perfect