Updated encoding