Using new version of data source.