changed data model