added modulator support