Added generic class for handling data sets