Updated viewModels and data persisters