Small changes in the link methods