Add callback option + change the way to retrieve taget link