Added Group management features