Updated from removal of HDF5 specific tree