Improvements on data model.