Fix persisting data source state