Add entity table classes - slightly more complete...
Merge branch 'table-entity'