Rework table entry to be _ID
Merge branch 'awan'