Added waveform generation module