Added some more functionality to groups