Storage implementeed, Enumeration changed to be generic for select items.