- updated implementation of storage data