finishing touches new data model