Small changes for group handling