Added daemon waveform support