Modified data model