Implement proper data set data source
Fix ingester notifications