slight change of data model