Added Encoder