Add option to set custom Links
issue