MOAR work on the Storage API