Added more data set construction stuff