Significantly improved the support for groups.