Further changes to conversation and message classes