Revised data model