Updated on Dropbox

Replace the datastore function with the core function