Add model class group
Table entity in the making
Merge branch 'table-entity' - work in progress