Update by device instead of index