Changes for HDF5 I/O