Changes to support the updated Encoder/Decoder api