Do more support on exporting zips.

 - Also fix bug where characteristics were unset for a storage.
 - Fix include bug where storage class was not being populated.