Adding HDF5 support