Add Link support
Merge branch 'feature-add-links-support'