Conversation model fixing and refactoring