Reworked the data models and structure.