Update models and API to include messages in conversations