Added storage API back in. Should work out of the box.