Add support for h5 and h6