Added ability to add groups and members