Improve group handling.