Update to ValueStorage