Add FetchedDataSource
Get rid of awkward stuff