Add link support + fix
Add link support + fix