Mior changes to DataSet creation routine.