Added linking to devices