Changes to messaging and conversation logic