Storage api (16/30)

Storage api