Update Message controller to deal with chat service
More updates!