Added link managment