Add final functionality for groups