Switch to simpler hdf5 representation of support