Improved attachment linking