Also fixed the design of the data model