First Data Model
Revised data model