Initial modifications to h5bp