Start of additions to support chat functionality