Better link management