Added Encoder Decoder