Add Encoder/Decoder Class