Updating the Conversation And Expression Assets (and tests) to reflect the new domain model