More changes to the DataSet