Simplified the data model.