changed to datasource class
added generated values for csv