Conversations refactoring