Updated Chat Handler