Rework table entry to be _ID