Improve the data model and the seed data