Use storage context instead of storage properties here