Updated persistence to include correct data source