Improving HDF5 support