Modified some data model