Added missing link handling