Reworked Group class