Restructured the DataSet Type