Add encoder/decoder - Modulator missing