improved the data model.