Updated for blobstorage