Add simple link support