Added new data model