Finished new data model implementing