Support new Encode.pm