More work on the new storage interface