modify DataSet to cope with spark