Updated with stuff from H5BP