Updated for latest h5bp developments