Separated out the dataprovider from the security