Improved link creation