Will and Steve - revise ValueStorage