Added support for groups and friendships