Added changes needed for chat.