Fix incorrect objects
Added chat groups