Simplify the data source

Don't actually need to know the data point type.