model altered: added Group entity