Update use of storage functions