Updated Chat Class