Refactored storage to v4. Now we are keeping 2 bytes per value