Data Model v1 complete