Adding group chat support