Updated encoding of bootstrap