Added beta functionality to ChatController