Modularise link creation