Working on the partial storage API