Adding content-type support to the encoders