Final version save feature with data model