small changes to new dataprovider