Data model updated (no conflict resolution yet)