Changes to conversation classes