Added the data source implementation too. (forgot from previous commit)