changed the data models