Added link handling