Enhanced data model