DEVIDM-131: Tweaked the data source.