Added group model instead of hard coding group names as strings