Added DataSet class