Worked on chat service more