added Blobstore support