Improved data model