DEVIDM-131: Tweaked the data source.
Merge pull request #103 from iceglow/DEVIDM-131

DEVIDM-131: Tweaked the data source.