Added persistence to data model