Update storage wrappers