Updates to sample_data factory