Storage api (29/30)

Storage api