Improved datasource prototype.