Storage api (28/30)

Storage api