Group management changes
Group issue fix