Updated the promises in datastorage to look a bit more neat.