Adapt data freeze code base to integrate with dataset.persistence