Added chooser support for links