Completely refactored data handling after data set is created