Pull in Dropbox datastore work