Add more waveforms