Add emap and econtramap to Decoder and Encoder