Fixing up the handling of the data source