Added linking to droids