Changed table name for group
Merge branch 'model'