Improved data model.