Groups Changes for message integration

Groups Changes for message integration