Updated linking method