Updated Chat module for one to one chat