Update according to new storage API