Improved data model
Improved data model.