Updates from data model discussion.