solidified the data model