Fix storage type classes