wip: extended data model