Changes to reflect H5B last version