Group implementation overhaul