Improved DataProvider and tested on examples project.