Improved group handling