Added data set creation and logging